Code check

Author: Sunanda

SimG4CMS/Calo/src/HFFibre.cc

@@ -18,11 +18,12 @@ HFFibre::HFFibre(const std::string& name,
                  const HcalSimulationParameters* hps,
                  edm::ParameterSet const& p)
     : hcalConstant_(hcons), hcalsimpar_(hps) {
-  edm::ParameterSet m_HF = (p.getParameter<edm::ParameterSet>("HFShower")).getParameter<edm::ParameterSet>("HFShowerBlock");
+  edm::ParameterSet m_HF =
+      (p.getParameter<edm::ParameterSet>("HFShower")).getParameter<edm::ParameterSet>("HFShowerBlock");
   cFibre = c_light * (m_HF.getParameter<double>("CFibre"));
-
+#ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HFShower") << "HFFibre:: Speed of light in fibre " << cFibre << " m/ns";
-
+#endif
   // Attenuation length
   attL = hcalsimpar_->attenuationLength_;
   nBinAtt = static_cast<int>(attL.size());
@@ -118,21 +119,21 @@ double HFFibre::zShift(const G4ThreeVector& point, int depth, int fromEndAbs) {
   int ieta = 0;
   double length = 250 * CLHEP::cm;
   if (fromEndAbs < 0) {
-    zFibre = 0.5 * gpar[1] - point.z();  // 
+    zFibre = 0.5 * gpar[1] - point.z();  //
   } else {
     // Defines the Radius bin by radial subdivision
     for (int i = nBinR - 1; i > 0; --i)
       if (hR < radius[i])
         ieta = nBinR - i - 1;
     // Defines the full length of the fibre (For onlyLong)
     if (static_cast<int>(longFL.size()) > ieta)
-      length = longFL[ieta];  
-    zFibre = length;   // from beginning of abs (full length)
+      length = longFL[ieta];
+    zFibre = length;  // from beginning of abs (full length)
     if (fromEndAbs > 0) {
-      zFibre -= gpar[1];   // length from end of HF  
+      zFibre -= gpar[1];  // length from end of HF
     } else {
-      double zz = 0.5 * gpar[1] + point.z();    // depth of point of photon emission (from beginning of HF)
-      zFibre -= zz;        // length of fiber from point of photon emission 
+      double zz = 0.5 * gpar[1] + point.z();  // depth of point of photon emission (from beginning of HF)
+      zFibre -= zz;                           // length of fiber from point of photon emission
     }
   }
 

SimG4CMS/Calo/src/HFShower.cc

@@ -144,7 +144,7 @@ std::vector<HFShower::Hit> HFShower::getHits(const G4Step *aStep, double weight)
       if (applyFidCut_ || chkFibre_ < 0 || (r1 <= exp(-p * zFibre) && r2 <= probMax_)) {
         hit.depth = depth;
         hit.time = tSlice + time;
-	// Temporary fix
+        // Temporary fix
         if (!applyFidCut_) {
           hit.wavelength = wavelength[i];
           hit.momentum = momz[i];
@@ -200,8 +200,8 @@ std::vector<HFShower::Hit> HFShower::getHits(const G4Step *aStep, bool forLibrar
   G4StepPoint *preStepPoint = aStep->GetPreStepPoint();
   const G4ThreeVector &globalPos = preStepPoint->GetPosition();
   G4String name = preStepPoint->GetTouchable()->GetSolid(0)->GetName();
-  double zb = std::abs(globalPos.z()-zoffset);  		 	     // from beginning of HF
-  double zv = zb - .5*gpar_[1];                  		 	     // from center of HF
+  double zb = std::abs(globalPos.z() - zoffset);  // from beginning of HF
+  double zv = zb - .5 * gpar_[1];                 // from center of HF
   G4ThreeVector localPos = G4ThreeVector(globalPos.x(), globalPos.y(), zv);
   G4ThreeVector localMom = preStepPoint->GetTouchable()->GetHistory()->GetTopTransform().TransformAxis(momentumDir);
   bool ok = true;
@@ -235,10 +235,10 @@ std::vector<HFShower::Hit> HFShower::getHits(const G4Step *aStep, bool forLibrar
   if (ok && npe > 0) {
     for (int i = 0; i < npe; ++i) {
       hit.depth = depth;
-//      hit.time = tSlice + time;
-      hit.time = tSlice;     // only shower time, fiber propagation time to be set on reading library
-      hit.wavelength = wavelength[i];  
-      hit.momentum = momz[i];	       
+      //      hit.time = tSlice + time;
+      hit.time = tSlice;  // only shower time, fiber propagation time to be set on reading library
+      hit.wavelength = wavelength[i];
+      hit.momentum = momz[i];
       hit.position = globalPos;
       hits.push_back(hit);
       nHit++;

SimG4CMS/ShowerLibraryProducer/src/HcalForwardAnalysis.cc

@@ -51,7 +51,8 @@ HcalForwardAnalysis::~HcalForwardAnalysis() {}
 //
 
 void HcalForwardAnalysis::produce(edm::Event& iEvent, const edm::EventSetup&) {
-  if(fillt) fillEvent();
+  if (fillt)
+    fillEvent();
 }
 
 void HcalForwardAnalysis::init() {
@@ -190,17 +191,17 @@ void HcalForwardAnalysis::setPhotons(const EndOfEvent* evt) {
     }
   } else {
     edm::LogVerbatim("HcalForwardLib") << "HcalForwardAnalysis::setPhotons(): No Chamber hits are stored";
-    fillt=false;
+    fillt = false;
     return;
   }
   primX = primPosOnSurf.x();
   primY = primPosOnSurf.y();
   primZ = primPosOnSurf.z();
-  if (primZ < 990) {         // there were interactions before HF
+  if (primZ < 990) {  // there were interactions before HF
     edm::LogVerbatim("HcalForwardLib") << "HcalForwardAnalysis::setPhotons(): First interaction before HF";
-    fillt=false;
+    fillt = false;
     return;
-  }     
+  }
   primT = primTimeOnSurf;
   primMomX = primMomDirOnSurf.x();
   primMomY = primMomDirOnSurf.y();
@@ -209,44 +210,44 @@ void HcalForwardAnalysis::setPhotons(const EndOfEvent* evt) {
   double theta = primMomDirOnSurf.theta();
   double phi = primMomDirOnSurf.phi();
 
-  // my insert ----------------------------------------------------------------                 
-  double sphi   = sin(phi);
-  double cphi   = cos(phi);
+  // my insert ----------------------------------------------------------------
+  double sphi = sin(phi);
+  double cphi = cos(phi);
   double ctheta = cos(theta);
   double stheta = sin(theta);
 
-  double pex = 0, pey = 0,zv = 0;
-  double xx,yy,zz ;
+  double pex = 0, pey = 0, zv = 0;
+  double xx, yy, zz;
 
   for (unsigned int k = 0; k < LongFiberPhotons.size(); ++k) {
     HFShowerPhoton aPhoton = LongFiberPhotons[k];
     // global coordinates
-    xx =aPhoton.x();
-    yy =aPhoton.y();
-    zz =aPhoton.z();
+    xx = aPhoton.x();
+    yy = aPhoton.y();
+    zz = aPhoton.z();
 
     // local coordinates in rotated to shower axis system and vs shower origin
-    pex = xx*ctheta*cphi + yy*ctheta*sphi - zz*stheta;
-    pey = -xx*sphi + yy*cphi;
-    zv = xx*stheta*cphi + yy*stheta*sphi + zz*ctheta-primZ/ctheta;
+    pex = xx * ctheta * cphi + yy * ctheta * sphi - zz * stheta;
+    pey = -xx * sphi + yy * cphi;
+    zv = xx * stheta * cphi + yy * stheta * sphi + zz * ctheta - primZ / ctheta;
 
     double photonProdTime = aPhoton.t() - primTimeOnSurf;
-    thePhotons.push_back(Photon(1, pex,pey,zv, photonProdTime, aPhoton.lambda()));
+    thePhotons.push_back(Photon(1, pex, pey, zv, photonProdTime, aPhoton.lambda()));
   }
   for (unsigned int k = 0; k < ShortFiberPhotons.size(); ++k) {
     HFShowerPhoton aPhoton = ShortFiberPhotons[k];
     // global coordinates
-    xx =aPhoton.x();
-    yy =aPhoton.y();
-    zz =aPhoton.z();
+    xx = aPhoton.x();
+    yy = aPhoton.y();
+    zz = aPhoton.z();
 
     // local coordinates in rotated to shower axis system and vs shower origin
-    pex = xx*ctheta*cphi + yy*ctheta*sphi - zz*stheta;
-    pey = -xx*sphi + yy*cphi;
-    zv = xx*stheta*cphi + yy*stheta*sphi + zz*ctheta-primZ/ctheta;
+    pex = xx * ctheta * cphi + yy * ctheta * sphi - zz * stheta;
+    pey = -xx * sphi + yy * cphi;
+    zv = xx * stheta * cphi + yy * stheta * sphi + zz * ctheta - primZ / ctheta;
 
     double photonProdTime = aPhoton.t() - primTimeOnSurf;
-    thePhotons.push_back(Photon(2, pex,pey,zv, photonProdTime, aPhoton.lambda()));
+    thePhotons.push_back(Photon(2, pex, pey, zv, photonProdTime, aPhoton.lambda()));
   }
 }