Code format

Author: civanch

SimG4Core/Application/interface/RunManagerMT.h

@@ -90,8 +90,12 @@ class RunManagerMT {
 
   void addRegions();
 
-  void addG4Region(const std::vector<G4LogicalVolume*>&, const std::string& regName,
-		   double cutg, double cute, double cutp, double cuti);
+  void addG4Region(const std::vector<G4LogicalVolume*>&,
+                   const std::string& regName,
+                   double cutg,
+                   double cute,
+                   double cutp,
+                   double cuti);
 
   G4MTRunManagerKernel* m_kernel;
 

SimG4Core/Application/src/Phase2StackingAction.cc

@@ -19,7 +19,7 @@
 #include "G4LossTableManager.hh"
 
 Phase2StackingAction::Phase2StackingAction(const edm::ParameterSet& p, const CMSSteppingVerbose* sv)
-  : steppingVerbose(sv) {
+    : steppingVerbose(sv) {
   trackNeutrino = p.getParameter<bool>("TrackNeutrino");
   killHeavy = p.getParameter<bool>("KillHeavy");
   killGamma = p.getParameter<bool>("KillGamma");
@@ -377,7 +377,7 @@ void Phase2StackingAction::initPointer() {
   // Russian roulette
   const std::vector<G4Region*>* rs = G4RegionStore::GetInstance();
 
-  for (auto const & reg : *rs) {
+  for (auto const& reg : *rs) {
     const G4String& rname = reg->GetName();
     if ((gRusRoEcal < 1.0 || nRusRoEcal < 1.0) && rname == "EcalRegion") {
       regionEcal = reg;

SimG4Core/Application/src/RunManagerMT.cc

@@ -220,7 +220,7 @@ void RunManagerMT::initG4(const DDCompactView* pDD,
     throw cms::Exception("LogicError") << "G4RunManagerKernel initialization failed!";
   }
 
-  if (m_check) {    
+  if (m_check) {
     checkVoxels();
   }
 
@@ -367,15 +367,20 @@ void RunManagerMT::runForPhase2() {
 // This method should be extended in order to add new regions via names of logical volume
 // and to add a new production cuts for these regions
 void RunManagerMT::addRegions() {
-
   CMSG4RegionReporter rep;
   rep.ReportRegions("g4region.txt");
 }
 
 // This is a utility method to add a G4Region
-void RunManagerMT::addG4Region(const std::vector<G4LogicalVolume*>& v, const std::string& rName,
-			       double cutg, double cute, double cutp, double cuti) {
-  if (v.empty()) { return; }
+void RunManagerMT::addG4Region(const std::vector<G4LogicalVolume*>& v,
+                               const std::string& rName,
+                               double cutg,
+                               double cute,
+                               double cutp,
+                               double cuti) {
+  if (v.empty()) {
+    return;
+  }
   auto reg = new G4Region((G4String)rName);
   for (auto const& lv : v) {
     reg->AddRootLogicalVolume(lv, true);

SimG4Core/Application/src/RunManagerMTWorker.cc

@@ -748,42 +748,40 @@ void RunManagerMTWorker::DumpMagneticField(const G4Field* field, const std::stri
 
     double dr = 2 * CLHEP::cm;
     double dz = 10 * CLHEP::cm;
-    double dphi = phimax/32.;
+    double dphi = phimax / 32.;
 
     int nr = G4lrint(rmax / dr);
     int nz = G4lrint(2 * zmax / dz);
     int nphi = G4lrint(phimax / dphi);
-    
 
     double point[4] = {0.0, 0.0, 0.0, 0.0};
     double bfield[3] = {0.0, 0.0, 0.0};
 
     double z;
-    double d1 = 1./CLHEP::rad;
-    double d2 = 1./CLHEP::mm;
-    double d3 = 1./CLHEP::tesla;
+    double d1 = 1. / CLHEP::rad;
+    double d2 = 1. / CLHEP::mm;
+    double d3 = 1. / CLHEP::tesla;
 
     fout << std::setprecision(6);
     fout << "### " << file << " CMS magnetic field: phi(rad) R(mm) Z(mm) Bx(tesla) By(tesla) Bz(tesla)  ###" << G4endl;
     for (int k = 0; k <= nphi; ++k) {
-      double phi = k*dphi;
+      double phi = k * dphi;
       double cosf = cos(phi);
       double sinf = sin(phi);
       double r = 0.0;
       double z0 = -zmax;
       for (int i = 0; i <= nr; ++i) {
-	z = z0;
-	for (int j = 0; j <= nz; ++j) {
-	  point[0] = r * cosf;
-	  point[1] = r * sinf;
-	  point[2] = z;
-	  field->GetFieldValue(point, bfield);
-	  fout << phi*d1 << " " << r*d2 << " " << z*d2
-	       << " " << bfield[0]*d3 << " " << bfield[1]*d3
-	       << " " << bfield[2]*d3 << G4endl;
-	  z += dz;
-	}
-	r += dr;
+        z = z0;
+        for (int j = 0; j <= nz; ++j) {
+          point[0] = r * cosf;
+          point[1] = r * sinf;
+          point[2] = z;
+          field->GetFieldValue(point, bfield);
+          fout << phi * d1 << " " << r * d2 << " " << z * d2 << " " << bfield[0] * d3 << " " << bfield[1] * d3 << " "
+               << bfield[2] * d3 << G4endl;
+          z += dz;
+        }
+        r += dr;
       }
     }
     fout.close();