fix error message and REST photon index output

JeffersonLab · Jun 4, 2021 · 8397503 · 8397503
1 parent 5c5d5a5
commit 8397503
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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);
 		}
 	}