Merge pull request #76 from pinkenburg/master

pinkenburg · pinkenburg · commit 7b10b5442aca · 2015-10-15T20:09:44.000-04:00
add light correction to inner hcal stepping action, remove track pathlength from hcal hits, fix cppcheck performance warnings
diff --git a/simulation/g4simulation/g4detectors/PHG4BlockCellGeomContainer.cc b/simulation/g4simulation/g4detectors/PHG4BlockCellGeomContainer.cc
@@ -25,7 +25,7 @@ void
 PHG4BlockCellGeomContainer::identify(std::ostream& os) const
 {
   map<int,PHG4BlockCellGeom *>::const_iterator iter;
-  for (iter=layergeoms.begin(); iter != layergeoms.end(); iter++)
+  for (iter=layergeoms.begin(); iter != layergeoms.end(); ++iter)
     {
       cout << "layer " << iter->first << endl;
       (iter->second)->identify(os);
diff --git a/simulation/g4simulation/g4detectors/PHG4BlockGeomContainer.cc b/simulation/g4simulation/g4detectors/PHG4BlockGeomContainer.cc
@@ -28,7 +28,7 @@ PHG4BlockGeomContainer::identify(std::ostream& os) const
   os << "mag field: " << _magfield << endl;
   os << "number of layers: " << _layergeoms.size() << endl;
   map<int,PHG4BlockGeom *>::const_iterator iter;
-  for (iter=_layergeoms.begin(); iter != _layergeoms.end(); iter++)
+  for (iter=_layergeoms.begin(); iter != _layergeoms.end(); ++iter)
   {
     (iter->second)->identify(os);
   }
diff --git a/simulation/g4simulation/g4detectors/PHG4CylinderCellContainer.cc b/simulation/g4simulation/g4detectors/PHG4CylinderCellContainer.cc
@@ -29,14 +29,14 @@ PHG4CylinderCellContainer::identify(ostream& os) const
 {
    map<unsigned int,PHG4CylinderCell *>::const_iterator iter;
    os << "Number of cells: " << size() << endl;
-   for (iter = cellmap.begin(); iter != cellmap.end(); iter++)
+   for (iter = cellmap.begin(); iter != cellmap.end(); ++iter)
      {
        os << "cell key 0x" << hex << iter->first << dec << endl;
        (iter->second)->identify();
      }
    set<int>::const_iterator siter;
    os << "Number of layers: " << num_layers() << endl;
-   for (siter = layers.begin(); siter != layers.end(); siter++)
+   for (siter = layers.begin(); siter != layers.end(); ++siter)
      {
        os << "layer : " << *siter << endl;
      }
@@ -131,7 +131,7 @@ PHG4CylinderCellContainer::getTotalEdep() const
 {
   ConstIterator iter;
   double totalenergy = 0;
-  for (iter = cellmap.begin(); iter != cellmap.end(); iter++)
+  for (iter = cellmap.begin(); iter != cellmap.end(); ++iter)
     {
       totalenergy += iter->second->get_edep();
     }
diff --git a/simulation/g4simulation/g4detectors/PHG4CylinderCellContainer.h b/simulation/g4simulation/g4detectors/PHG4CylinderCellContainer.h
@@ -48,7 +48,7 @@ class PHG4CylinderCellContainer: public PHObject
 	  }
 	else
 	  {
-	    its++;
+	    ++its;
 	  }
       }
   }
diff --git a/simulation/g4simulation/g4detectors/PHG4CylinderCellGeomContainer.cc b/simulation/g4simulation/g4detectors/PHG4CylinderCellGeomContainer.cc
@@ -25,7 +25,7 @@ void
 PHG4CylinderCellGeomContainer::identify(std::ostream& os) const
 {
   map<int,PHG4CylinderCellGeom *>::const_iterator iter;
-  for (iter=layergeoms.begin(); iter != layergeoms.end(); iter++)
+  for (iter=layergeoms.begin(); iter != layergeoms.end(); ++iter)
     {
       cout << "layer " << iter->first << endl;
       (iter->second)->identify(os);
diff --git a/simulation/g4simulation/g4detectors/PHG4CylinderCellReco.cc b/simulation/g4simulation/g4detectors/PHG4CylinderCellReco.cc
@@ -95,7 +95,7 @@ int PHG4CylinderCellReco::InitRun(PHCompositeNode *topNode)
   map<int, PHG4CylinderGeom *>::const_iterator miter;
   pair <map<int, PHG4CylinderGeom *>::const_iterator, map<int, PHG4CylinderGeom *>::const_iterator> begin_end = geo->get_begin_end();
   map<int, std::pair <double, double> >::iterator sizeiter;
-  for (miter = begin_end.first; miter != begin_end.second; miter++)
+  for (miter = begin_end.first; miter != begin_end.second; ++miter)
     {
       PHG4CylinderGeom *layergeom = miter->second;
       int layer = layergeom->get_layer();
@@ -981,7 +981,7 @@ PHG4CylinderCellReco::CheckEnergy(PHCompositeNode *topNode)
     }
   PHG4CylinderCellContainer::ConstRange cell_begin_end = cells->getCylinderCells();
   PHG4CylinderCellContainer::ConstIterator citer;
-  for (citer = cell_begin_end.first; citer != cell_begin_end.second; citer++)
+  for (citer = cell_begin_end.first; citer != cell_begin_end.second; ++citer)
     {
       sum_energy_cells += citer->second->get_edep();
     }
diff --git a/simulation/g4simulation/g4detectors/PHG4CylinderCellTPCReco.cc b/simulation/g4simulation/g4detectors/PHG4CylinderCellTPCReco.cc
@@ -77,7 +77,7 @@ int PHG4CylinderCellTPCReco::InitRun(PHCompositeNode *topNode)
   map<int, PHG4CylinderGeom *>::const_iterator miter;
   pair <map<int, PHG4CylinderGeom *>::const_iterator, map<int, PHG4CylinderGeom *>::const_iterator> begin_end = geo->get_begin_end();
   map<int, std::pair <double, double> >::iterator sizeiter;
-  for(miter = begin_end.first; miter != begin_end.second; miter++)
+  for(miter = begin_end.first; miter != begin_end.second; ++miter)
   {
     PHG4CylinderGeom *layergeom = miter->second;
     int layer = layergeom->get_layer();
diff --git a/simulation/g4simulation/g4detectors/PHG4FCalDetector.cc b/simulation/g4simulation/g4detectors/PHG4FCalDetector.cc
@@ -147,7 +147,7 @@ bool PHG4FCalDetector::isInScintillator(G4VPhysicalVolume * volume)
 {
   //loop over the physical volumes and see if this is a match
   std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();
-  for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )
+  for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )
   {
     if ( vol_iter->second == volume )
       return true;
@@ -161,7 +161,7 @@ int PHG4FCalDetector::getScintillatorLayer(G4VPhysicalVolume * volume)
 {
   //loop over the physical volumes and see if this is a match
   std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();
-  for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )
+  for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )
   {
     if ( vol_iter->second == volume )
       return vol_iter->first;
diff --git a/simulation/g4simulation/g4detectors/PHG4FPbScDetector.cc b/simulation/g4simulation/g4detectors/PHG4FPbScDetector.cc
@@ -160,7 +160,7 @@ bool PHG4FPbScDetector::isInScintillator(G4VPhysicalVolume * volume)
 {
   //loop over the physical volumes and see if this is a match
   std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();
-  for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )
+  for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )
   {
     if ( vol_iter->second == volume )
       {
@@ -175,7 +175,7 @@ int PHG4FPbScDetector::getScintillatorLayer(G4VPhysicalVolume * volume)
 {
   //loop over the physical volumes and see if this is a match
   std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();
-  for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )
+  for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )
   {
     if ( vol_iter->second == volume )
       return vol_iter->first;
diff --git a/simulation/g4simulation/g4detectors/PHG4InnerHcalParameters.cc b/simulation/g4simulation/g4detectors/PHG4InnerHcalParameters.cc
@@ -29,6 +29,12 @@ PHG4InnerHcalParameters::PHG4InnerHcalParameters():
   blackhole(0),
   material("SS310"),
   steplimits(NAN),
+  light_scint_model(true),
+  light_balance(false),
+  light_balance_inner_radius(0.0),
+  light_balance_inner_corr(1.0),
+  light_balance_outer_radius(10.0),
+  light_balance_outer_corr(1.0),
   absorbertruth(0)
 {}
 
diff --git a/simulation/g4simulation/g4detectors/PHG4InnerHcalParameters.h b/simulation/g4simulation/g4detectors/PHG4InnerHcalParameters.h
@@ -33,6 +33,12 @@ class PHG4InnerHcalParameters
   G4int blackhole;
   G4String material;
   G4double steplimits;
+  bool  light_scint_model;
+  bool light_balance;
+  G4double light_balance_inner_radius;
+  G4double light_balance_inner_corr;
+  G4double light_balance_outer_radius;
+  G4double light_balance_outer_corr;
   G4int absorbertruth;
 };
 
diff --git a/simulation/g4simulation/g4detectors/PHG4InnerHcalSteppingAction.cc b/simulation/g4simulation/g4detectors/PHG4InnerHcalSteppingAction.cc
@@ -38,12 +38,7 @@ PHG4InnerHcalSteppingAction::PHG4InnerHcalSteppingAction( PHG4InnerHcalDetector*
   hits_(NULL),
   absorberhits_(NULL),
   hit(NULL),
-  params(parameters),
-  light_balance_(false),
-  light_balance_inner_radius_(NAN),
-  light_balance_inner_corr_(NAN),
-  light_balance_outer_radius_(NAN),
-  light_balance_outer_corr_(NAN)
+  params(parameters)
 {}
 
 //____________________________________________________________________________..
@@ -127,7 +122,7 @@ bool PHG4InnerHcalSteppingAction::UserSteppingAction( const G4Step* aStep, bool
   // collect energy and track length step by step
   G4double edep = aStep->GetTotalEnergyDeposit() / GeV;
   G4double eion = (aStep->GetTotalEnergyDeposit() - aStep->GetNonIonizingEnergyDeposit()) / GeV;
-
+  G4double light_yield = 0;
   const G4Track* aTrack = aStep->GetTrack();
 
   // if this block stops everything, just put all kinetic energy into edep
@@ -188,8 +183,7 @@ bool PHG4InnerHcalSteppingAction::UserSteppingAction( const G4Step* aStep, bool
 	  hit->set_eion(0); // only implemented for v5 otherwise empty
 	  if (whichactive > 0) // return of IsInInnerHcalDetector, > 0 hit in scintillator, < 0 hit in absorber
 	    {
-        hit->set_light_yield(0); // for scintillator only, initialize light yields
-
+	      hit->set_light_yield(0); // for scintillator only, initialize light yields
 	      // Now add the hit
 	      hits_->AddHit(layer_id, hit);
 	    }
@@ -209,36 +203,74 @@ bool PHG4InnerHcalSteppingAction::UserSteppingAction( const G4Step* aStep, bool
       hit->set_z( 1, postPoint->GetPosition().z() / cm );
 
       hit->set_t( 1, postPoint->GetGlobalTime() / nanosecond );
-      //sum up the energy to get total deposited
-      hit->set_edep(hit->get_edep() + edep);
-      hit->set_eion(hit->get_eion() + eion);
-
 
       if (whichactive > 0) // return of IsInInnerHcalDetector, > 0 hit in scintillator, < 0 hit in absorber
         {
-          double light_yield = GetVisibleEnergyDeposition(aStep); // for scintillator only, calculate light yields
-          hit->set_light_yield(hit->get_light_yield() + light_yield);
-
-          static bool once = true;
-          if (once and edep > 0)
+          if (params->light_scint_model)
             {
-              once = false;
-
-	      if (verbosity > 0) {
-		cout << "PHG4InnerHcalSteppingAction::UserSteppingAction::"
-                  //
-		     << detector_->GetName() << " - "
-		     << " use scintillating light model at each Geant4 steps. "
-		     << "First step: " << "Material = "
-		     << aTrack->GetMaterialCutsCouple()->GetMaterial()->GetName()
-		     << ", " << "Birk Constant = "
-		     << aTrack->GetMaterialCutsCouple()->GetMaterial()->GetIonisation()->GetBirksConstant()
-		     << "," << "edep = " << edep << ", " << "eion = " << eion
-		     << ", " << "light_yield = " << light_yield << endl;
-	      }
+              light_yield = GetVisibleEnergyDeposition(aStep); // for scintillator only, calculate light yields
+	      static bool once = true;
+	      if (once && edep > 0)
+		{
+		  once = false;
+
+		  if (verbosity > 0) 
+		    {
+		      cout << "PHG4InnerHcalSteppingAction::UserSteppingAction::"
+			//
+			   << detector_->GetName() << " - "
+			   << " use scintillating light model at each Geant4 steps. "
+			   << "First step: " << "Material = "
+			   << aTrack->GetMaterialCutsCouple()->GetMaterial()->GetName()
+			   << ", " << "Birk Constant = "
+			   << aTrack->GetMaterialCutsCouple()->GetMaterial()->GetIonisation()->GetBirksConstant()
+			   << "," << "edep = " << edep << ", " << "eion = " << eion
+			   << ", " << "light_yield = " << light_yield << endl;
+		      cout << "light_balance: " << params->light_balance << endl;
+		    }
+		}
+	    }
+	  else
+            {
+              light_yield = eion;
+            }
+          if (params->light_balance)
+            {
+              float r = sqrt(
+			     pow(postPoint->GetPosition().x() / cm, 2)
+			     + pow(postPoint->GetPosition().y() / cm, 2));
+              const float cor = GetLightCorrection(r);
+              light_yield = light_yield * cor;
+
+              static bool once = true;
+              if (once && light_yield>0)
+                {
+                  once = false;
+
+		  if (verbosity > 1) 
+		    {
+		      cout << "PHG4OuterHcalSteppingAction::UserSteppingAction::"
+			//
+			   << detector_->GetName() << " - "
+			   << " use a simple light collection model with linear radial dependence. "
+			   <<"First step: "
+			   <<"r = " <<r<<", "
+			   <<"correction ratio = " <<cor<<", "
+			   <<"light_yield after cor. = " <<light_yield
+			   << endl;
+		    }
+                }
+
             }
         }
 
+      //sum up the energy to get total deposited
+      hit->set_edep(hit->get_edep() + edep);
+      hit->set_eion(hit->get_eion() + eion);
+       if (whichactive > 0)
+	{
+	  hit->set_light_yield(hit->get_light_yield() + light_yield);
+	}
       if (geantino)
 	{
 	  hit->set_edep(-1); // only energy=0 g4hits get dropped, this way geantinos survive the g4hit compression
@@ -302,3 +334,15 @@ void PHG4InnerHcalSteppingAction::SetInterfacePointers( PHCompositeNode* topNode
 	}
     }
 }
+
+float 
+PHG4InnerHcalSteppingAction::GetLightCorrection(const float r) const
+{
+  float m = (params->light_balance_outer_corr - params->light_balance_inner_corr)/(params->light_balance_outer_radius - params->light_balance_inner_radius);
+  float b = params->light_balance_inner_corr - m*params->light_balance_inner_radius;
+  float value = m*r+b;  
+  if (value > 1.0) return 1.0;
+  if (value < 0.0) return 0.0;
+
+  return value;
+}
diff --git a/simulation/g4simulation/g4detectors/PHG4InnerHcalSteppingAction.h b/simulation/g4simulation/g4detectors/PHG4InnerHcalSteppingAction.h
@@ -26,16 +26,8 @@ class PHG4InnerHcalSteppingAction : public PHG4SteppingAction
   //! reimplemented from base class
   virtual void SetInterfacePointers( PHCompositeNode* );
 
-  float GetLightCorrection(float r);
-  void SetLightCorrection(float inner_radius, float inner_corr,
-			  float outer_radius, float outer_corr) {
-    light_balance_ = true;
-    light_balance_inner_radius_ = inner_radius;
-    light_balance_inner_corr_ = inner_corr;
-    light_balance_outer_radius_ = outer_radius;
-    light_balance_outer_corr_ = outer_corr;
-  }
-  
+  float GetLightCorrection(const float r) const;
+
   private:
 
   //! pointer to the detector
@@ -46,12 +38,6 @@ class PHG4InnerHcalSteppingAction : public PHG4SteppingAction
   PHG4HitContainer * absorberhits_;
   PHG4Hit *hit;
   PHG4InnerHcalParameters *params;
-
-  bool  light_balance_;
-  float light_balance_inner_radius_;
-  float light_balance_inner_corr_;
-  float light_balance_outer_radius_;
-  float light_balance_outer_corr_;
 };
 
 
diff --git a/simulation/g4simulation/g4detectors/PHG4InnerHcalSubsystem.cc b/simulation/g4simulation/g4detectors/PHG4InnerHcalSubsystem.cc
@@ -270,12 +270,6 @@ PHG4InnerHcalSubsystem::SetScintiGap(const double scgap)
   params->scinti_gap_neighbor = scgap * cm;
 }
 
-void
-PHG4InnerHcalSubsystem::SetStepLimits(const double slim)
-{
-  params->steplimits = slim*cm;
-}
-
 void
 PHG4InnerHcalSubsystem::SetTiltViaNcross(const int ncross)
 {
@@ -291,3 +285,26 @@ PHG4InnerHcalSubsystem::SetTiltViaNcross(const int ncross)
     }
   params->ncross = ncross;
 }
+
+void
+PHG4InnerHcalSubsystem::SetStepLimits(const double slim)
+{
+  params->steplimits = slim*cm;
+}
+
+void
+PHG4InnerHcalSubsystem::SetLightCorrection(const float inner_radius, const float inner_corr,
+			  const float outer_radius, const float outer_corr) 
+{
+  params->light_balance = true;
+  params->light_balance_inner_radius = inner_radius;
+  params->light_balance_inner_corr = inner_corr;
+  params->light_balance_outer_radius = outer_radius;
+  params->light_balance_outer_corr = outer_corr;
+}
+
+void
+PHG4InnerHcalSubsystem:: SetLightScintModel(const bool b)
+{
+  params->light_scint_model = b;
+}
diff --git a/simulation/g4simulation/g4detectors/PHG4InnerHcalSubsystem.h b/simulation/g4simulation/g4detectors/PHG4InnerHcalSubsystem.h
@@ -75,6 +75,11 @@ class PHG4InnerHcalSubsystem: public PHG4Subsystem
   void SetScintiGap(const double scgap);
   void SetStepLimits(const double slim);
 
+  void SetLightCorrection(const float inner_radius, const float inner_corr,
+			  const float outer_radius, const float outer_corr);
+  void SetLightScintModel(const bool b = true);
+
+
   protected:
 
   //! detector geometry
diff --git a/simulation/g4simulation/g4detectors/PHG4OuterHcalSteppingAction.cc b/simulation/g4simulation/g4detectors/PHG4OuterHcalSteppingAction.cc
diff --git a/simulation/g4simulation/g4detectors/PHG4OuterHcalSteppingAction.h b/simulation/g4simulation/g4detectors/PHG4OuterHcalSteppingAction.h
diff --git a/simulation/g4simulation/g4detectors/PHG4SectorConstructor.cc b/simulation/g4simulation/g4detectors/PHG4SectorConstructor.cc
diff --git a/simulation/g4simulation/g4detectors/PHG4SectorConstructor.h b/simulation/g4simulation/g4detectors/PHG4SectorConstructor.h
diff --git a/simulation/g4simulation/g4detectors/PHG4SectorDetector.cc b/simulation/g4simulation/g4detectors/PHG4SectorDetector.cc

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ void`
`25`	`25`	`PHG4BlockCellGeomContainer::identify(std::ostream& os) const`
`26`	`26`	`{`
`27`	`27`	`map<int,PHG4BlockCellGeom *>::const_iterator iter;`
`28`		`- for (iter=layergeoms.begin(); iter != layergeoms.end(); iter++)`
	`28`	`+ for (iter=layergeoms.begin(); iter != layergeoms.end(); ++iter)`
`29`	`29`	`{`
`30`	`30`	`cout << "layer " << iter->first << endl;`
`31`	`31`	`(iter->second)->identify(os);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ PHG4BlockGeomContainer::identify(std::ostream& os) const`
`28`	`28`	`os << "mag field: " << _magfield << endl;`
`29`	`29`	`os << "number of layers: " << _layergeoms.size() << endl;`
`30`	`30`	`map<int,PHG4BlockGeom *>::const_iterator iter;`
`31`		`- for (iter=_layergeoms.begin(); iter != _layergeoms.end(); iter++)`
	`31`	`+ for (iter=_layergeoms.begin(); iter != _layergeoms.end(); ++iter)`
`32`	`32`	`{`
`33`	`33`	`(iter->second)->identify(os);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,14 @@ PHG4CylinderCellContainer::identify(ostream& os) const`
`29`	`29`	`{`
`30`	`30`	`map<unsigned int,PHG4CylinderCell *>::const_iterator iter;`
`31`	`31`	`os << "Number of cells: " << size() << endl;`
`32`		`- for (iter = cellmap.begin(); iter != cellmap.end(); iter++)`
	`32`	`+ for (iter = cellmap.begin(); iter != cellmap.end(); ++iter)`
`33`	`33`	`{`
`34`	`34`	`os << "cell key 0x" << hex << iter->first << dec << endl;`
`35`	`35`	`(iter->second)->identify();`
`36`	`36`	`}`
`37`	`37`	`set<int>::const_iterator siter;`
`38`	`38`	`os << "Number of layers: " << num_layers() << endl;`
`39`		`- for (siter = layers.begin(); siter != layers.end(); siter++)`
	`39`	`+ for (siter = layers.begin(); siter != layers.end(); ++siter)`
`40`	`40`	`{`
`41`	`41`	`os << "layer : " << *siter << endl;`
`42`	`42`	`}`
`@@ -131,7 +131,7 @@ PHG4CylinderCellContainer::getTotalEdep() const`
`131`	`131`	`{`
`132`	`132`	`ConstIterator iter;`
`133`	`133`	`double totalenergy = 0;`
`134`		`- for (iter = cellmap.begin(); iter != cellmap.end(); iter++)`
	`134`	`+ for (iter = cellmap.begin(); iter != cellmap.end(); ++iter)`
`135`	`135`	`{`
`136`	`136`	`totalenergy += iter->second->get_edep();`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class PHG4CylinderCellContainer: public PHObject`
`48`	`48`	`}`
`49`	`49`	`else`
`50`	`50`	`{`
`51`		`- its++;`
	`51`	`+ ++its;`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ int PHG4CylinderCellReco::InitRun(PHCompositeNode *topNode)`
`95`	`95`	`map<int, PHG4CylinderGeom *>::const_iterator miter;`
`96`	`96`	`pair <map<int, PHG4CylinderGeom >::const_iterator, map<int, PHG4CylinderGeom >::const_iterator> begin_end = geo->get_begin_end();`
`97`	`97`	`map<int, std::pair <double, double> >::iterator sizeiter;`
`98`		`- for (miter = begin_end.first; miter != begin_end.second; miter++)`
	`98`	`+ for (miter = begin_end.first; miter != begin_end.second; ++miter)`
`99`	`99`	`{`
`100`	`100`	`PHG4CylinderGeom *layergeom = miter->second;`
`101`	`101`	`int layer = layergeom->get_layer();`
`@@ -981,7 +981,7 @@ PHG4CylinderCellReco::CheckEnergy(PHCompositeNode *topNode)`
`981`	`981`	`}`
`982`	`982`	`PHG4CylinderCellContainer::ConstRange cell_begin_end = cells->getCylinderCells();`
`983`	`983`	`PHG4CylinderCellContainer::ConstIterator citer;`
`984`		`- for (citer = cell_begin_end.first; citer != cell_begin_end.second; citer++)`
	`984`	`+ for (citer = cell_begin_end.first; citer != cell_begin_end.second; ++citer)`
`985`	`985`	`{`
`986`	`986`	`sum_energy_cells += citer->second->get_edep();`
`987`	`987`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ int PHG4CylinderCellTPCReco::InitRun(PHCompositeNode *topNode)`
`77`	`77`	`map<int, PHG4CylinderGeom *>::const_iterator miter;`
`78`	`78`	`pair <map<int, PHG4CylinderGeom >::const_iterator, map<int, PHG4CylinderGeom >::const_iterator> begin_end = geo->get_begin_end();`
`79`	`79`	`map<int, std::pair <double, double> >::iterator sizeiter;`
`80`		`- for(miter = begin_end.first; miter != begin_end.second; miter++)`
	`80`	`+ for(miter = begin_end.first; miter != begin_end.second; ++miter)`
`81`	`81`	`{`
`82`	`82`	`PHG4CylinderGeom *layergeom = miter->second;`
`83`	`83`	`int layer = layergeom->get_layer();`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ bool PHG4FCalDetector::isInScintillator(G4VPhysicalVolume * volume)`
`147`	`147`	`{`
`148`	`148`	`//loop over the physical volumes and see if this is a match`
`149`	`149`	`std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();`
`150`		`- for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )`
	`150`	`+ for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )`
`151`	`151`	`{`
`152`	`152`	`if ( vol_iter->second == volume )`
`153`	`153`	`return true;`
`@@ -161,7 +161,7 @@ int PHG4FCalDetector::getScintillatorLayer(G4VPhysicalVolume * volume)`
`161`	`161`	`{`
`162`	`162`	`//loop over the physical volumes and see if this is a match`
`163`	`163`	`std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();`
`164`		`- for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )`
	`164`	`+ for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )`
`165`	`165`	`{`
`166`	`166`	`if ( vol_iter->second == volume )`
`167`	`167`	`return vol_iter->first;`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ bool PHG4FPbScDetector::isInScintillator(G4VPhysicalVolume * volume)`
`160`	`160`	`{`
`161`	`161`	`//loop over the physical volumes and see if this is a match`
`162`	`162`	`std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();`
`163`		`- for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )`
	`163`	`+ for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )`
`164`	`164`	`{`
`165`	`165`	`if ( vol_iter->second == volume )`
`166`	`166`	`{`
`@@ -175,7 +175,7 @@ int PHG4FPbScDetector::getScintillatorLayer(G4VPhysicalVolume * volume)`
`175`	`175`	`{`
`176`	`176`	`//loop over the physical volumes and see if this is a match`
`177`	`177`	`std::map<unsigned int, G4VPhysicalVolume*>::iterator vol_iter = scintillator_physi_.begin();`
`178`		`- for ( ; vol_iter != scintillator_physi_.end(); vol_iter ++ )`
	`178`	`+ for ( ; vol_iter != scintillator_physi_.end(); ++vol_iter )`
`179`	`179`	`{`
`180`	`180`	`if ( vol_iter->second == volume )`
`181`	`181`	`return vol_iter->first;`