From 8397503dfd7f3875badd977ea065a141322f2494 Mon Sep 17 00:00:00 2001 From: Sean Dobbs Date: Fri, 4 Jun 2021 14:30:37 -0400 Subject: [PATCH] fix error message and REST photon index output --- src/libraries/HDDM/DEventSourceREST.cc | 6 +++--- src/libraries/HDDM/DEventWriterREST.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/HDDM/DEventSourceREST.cc b/src/libraries/HDDM/DEventSourceREST.cc index 3d8ff5647..95aa4e161 100644 --- a/src/libraries/HDDM/DEventSourceREST.cc +++ b/src/libraries/HDDM/DEventSourceREST.cc @@ -582,13 +582,13 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record, taghGeom->E_to_counter(locTAGHiter->getE(), gamma->dCounter); if (locTaghChannelList.size() > 0) { if (gamma->dCounter != locTaghChannelList().getCounter()) { - std::cerr << "Error in DEventSourceREST - tagger microscope energy " + std::cerr << "Error in DEventSourceREST - tagger hodooscope energy " "lookup mismatch:" << std::endl - << " TAGM column = " << locTaghChannelList().getCounter() + << " TAGH column = " << locTaghChannelList().getCounter() << std::endl << " Etag = " << locTAGHiter->getE() << std::endl - << " lookup finds TAGM column = " << gamma->dCounter + << " lookup finds TAGH column = " << gamma->dCounter << std::endl; exit(17); } diff --git a/src/libraries/HDDM/DEventWriterREST.cc b/src/libraries/HDDM/DEventWriterREST.cc index 487a34184..2120bc701 100644 --- a/src/libraries/HDDM/DEventWriterREST.cc +++ b/src/libraries/HDDM/DEventWriterREST.cc @@ -207,7 +207,7 @@ bool DEventWriterREST::Write_RESTEvent(JEventLoop* locEventLoop, string locOutpu locTagmBeamPhotonList().setT(locBeamPhotons_TAGGEDMCGEN[loc_i]->time()); locTagmBeamPhotonList().setE(locBeamPhotons_TAGGEDMCGEN[loc_i]->energy()); hddm_r::TagmChannelList locTagmChannelList = locTagmBeamPhotonList().addTagmChannels(1); - locTagmChannelList().setColumn(locBeamPhotons[loc_i]->dCounter); + locTagmChannelList().setColumn(locBeamPhotons_TAGGEDMCGEN[loc_i]->dCounter); } else if(locBeamPhotons_TAGGEDMCGEN[loc_i]->dSystem == SYS_TAGH) { @@ -216,7 +216,7 @@ bool DEventWriterREST::Write_RESTEvent(JEventLoop* locEventLoop, string locOutpu locTaghBeamPhotonList().setT(locBeamPhotons_TAGGEDMCGEN[loc_i]->time()); locTaghBeamPhotonList().setE(locBeamPhotons_TAGGEDMCGEN[loc_i]->energy()); hddm_r::TaghChannelList locTaghChannelList = locTaghBeamPhotonList().addTaghChannels(1); - locTaghChannelList().setCounter(locBeamPhotons[loc_i]->dCounter); + locTaghChannelList().setCounter(locBeamPhotons_TAGGEDMCGEN[loc_i]->dCounter); } }