* complete the explanatory comment in the source file header [rtj]

Conflicts: src/libraries/TAGGER/DTAGHGeometry.cc src/libraries/TAGGER/DTAGMGeometry.cc
JeffersonLab · Apr 4, 2021 · 7a1ccc6 · 7a1ccc6
1 parent ee70893
commit 7a1ccc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/src/libraries/HDDM/DEventSourceREST.cc b/src/libraries/HDDM/DEventSourceREST.cc
@@ -551,10 +551,10 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
       hddm_r::TaghChannelList &locTaghChannelList = locTAGHiter->getTaghChannels();
       taghGeom->E_to_counter(locTAGHiter->getE(), gamma->dCounter);
       if (locTaghChannelList.size() > 0) {
-         if (gamma->dCounter != locTaghChannelList().getColumn()) {
+         if (gamma->dCounter != locTaghChannelList().getCounter()) {
             std::cerr << "Error in DEventSourceREST - tagger microscope energy "
                          "lookup mismatch:" << std::endl
-                      << "   TAGM column = " << locTaghChannelList().getColumn()
+                      << "   TAGM column = " << locTaghChannelList().getCounter()
                       << std::endl
                       << "   Etag = " << locTAGHiter->getE()
                       << std::endl

diff --git a/src/libraries/HDDM/DEventWriterREST.cc b/src/libraries/HDDM/DEventWriterREST.cc
@@ -407,26 +407,6 @@ bool DEventWriterREST::Write_RESTEvent(JEventLoop* locEventLoop, string locOutpu
 
 	}
 
-	// push any DEventHitStatistics objects to the output record
-	if (hitStats.size() > 0)
-	{
-		hddm_r::HitStatisticsList stats = res().addHitStatisticses(1);
-		hddm_r::StartCountersList starts = stats().addStartCounterses(1);
-		starts().setCount(hitStats[0]->start_counters);
-		hddm_r::CdcStrawsList straws = stats().addCdcStrawses(1);
-		straws().setCount(hitStats[0]->cdc_straws);
-		hddm_r::FdcPseudosList pseudos = stats().addFdcPseudoses(1);
-		pseudos().setCount(hitStats[0]->fdc_pseudos);
-		hddm_r::BcalCellsList cells = stats().addBcalCellses(1);
-		cells().setCount(hitStats[0]->bcal_cells);
-		hddm_r::FcalBlocksList blocks = stats().addFcalBlockses(1);
-		blocks().setCount(hitStats[0]->fcal_blocks);
-		hddm_r::CcalBlocksList bloccs = stats().addCcalBlockses(1);
-		bloccs().setCount(hitStats[0]->ccal_blocks);
-		hddm_r::DircPMTsList pmts = stats().addDircPMTses(1);
-		pmts().setCount(hitStats[0]->dirc_PMTs);
-	}
-
 	// push any DTrigger objects to the output record
 	for (size_t i=0; i < locTriggers.size(); ++i)
 	{