Code check

cms-sw · Aug 28, 2021 · b8a9bf4 · b8a9bf4
1 parent f063188
commit b8a9bf4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc
@@ -42,34 +42,36 @@
 
 using angle_units::operators::convertRadToDeg;
 
-typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
+typedef std::multimap<G4LogicalVolume *, G4VPhysicalVolume *, std::less<G4LogicalVolume *> > mmlvpv;
 
-class PrintGeomInfoAction : public SimWatcher, public Observer<const BeginOfJob*>, public Observer<const BeginOfRun*> {
+class PrintGeomInfoAction : public SimWatcher,
+                            public Observer<const BeginOfJob *>,
+                            public Observer<const BeginOfRun *> {
 public:
-  PrintGeomInfoAction(edm::ParameterSet const& p);
+  PrintGeomInfoAction(edm::ParameterSet const &p);
   ~PrintGeomInfoAction() override;
 
 private:
-  void update(const BeginOfJob* job) override;
-  void update(const BeginOfRun* run) override;
-  void dumpSummary(std::ostream& out = std::cout);
-  void dumpG4LVList(std::ostream& out = std::cout);
-  void dumpG4LVTree(std::ostream& out = std::cout);
-  void dumpMaterialList(std::ostream& out = std::cout);
-  void dumpG4LVLeaf(G4LogicalVolume* lv, unsigned int leafDepth, unsigned int count, std::ostream& out = std::cout);
+  void update(const BeginOfJob *job) override;
+  void update(const BeginOfRun *run) override;
+  void dumpSummary(std::ostream &out = std::cout);
+  void dumpG4LVList(std::ostream &out = std::cout);
+  void dumpG4LVTree(std::ostream &out = std::cout);
+  void dumpMaterialList(std::ostream &out = std::cout);
+  void dumpG4LVLeaf(G4LogicalVolume *lv, unsigned int leafDepth, unsigned int count, std::ostream &out = std::cout);
   int countNoTouchables();
-  void add1touchable(G4LogicalVolume* lv, int& nTouch);
-  void dumpHierarchyTreePVLV(std::ostream& out = std::cout);
-  void dumpHierarchyLeafPVLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpPV(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpSolid(G4VSolid* sol, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void add1touchable(G4LogicalVolume *lv, int &nTouch);
+  void dumpHierarchyTreePVLV(std::ostream &out = std::cout);
+  void dumpHierarchyLeafPVLV(G4LogicalVolume *lv, unsigned int leafDepth, std::ostream &out = std::cout);
+  void dumpLV(G4LogicalVolume *lv, unsigned int leafDepth, std::ostream &out = std::cout);
+  void dumpPV(G4VPhysicalVolume *pv, unsigned int leafDepth, std::ostream &out = std::cout);
+  void dumpSolid(G4VSolid *sol, unsigned int leafDepth, std::ostream &out = std::cout);
+  void dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, std::ostream &out = std::cout);
   void dumpInFile();
-  void getTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, unsigned int copym, std::vector<std::string>& touches);
+  void getTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, unsigned int copym, std::vector<std::string> &touches);
   std::string spacesFromLeafDepth(unsigned int leafDepth);
-  G4VPhysicalVolume* getTopPV();
-  G4LogicalVolume* getTopLV();
+  G4VPhysicalVolume *getTopPV();
+  G4LogicalVolume *getTopLV();
 
 private:
   bool dumpSummary_, dumpLVTree_, dumpLVList_, dumpMaterial_;
@@ -81,7 +83,7 @@ class PrintGeomInfoAction : public SimWatcher, public Observer<const BeginOfJob*
   std::string fileMat_, fileSolid_, fileLV_, filePV_, fileTouch_;
   bool fileDetail_;
   std::vector<std::string> names_;
-  G4VPhysicalVolume* theTopPV_;
+  G4VPhysicalVolume *theTopPV_;
   G4NavigationHistory fHistory_;
 };
 

diff --git a/SimG4Core/PrintGeomInfo/plugins/PrintGeomSummary.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomSummary.cc
@@ -36,31 +36,31 @@
 #include <set>
 #include <string>
 
-class PrintGeomSummary : public SimWatcher, public Observer<const BeginOfJob *>, public Observer<const BeginOfRun *> {
+class PrintGeomSummary : public SimWatcher, public Observer<const BeginOfJob*>, public Observer<const BeginOfRun*> {
 public:
-  PrintGeomSummary(edm::ParameterSet const &p);
+  PrintGeomSummary(edm::ParameterSet const& p);
   ~PrintGeomSummary() override;
 
 private:
-  void update(const BeginOfJob *job) override;
-  void update(const BeginOfRun *run) override;
-  void addSolid(const DDLogicalPart &part);
-  void fillLV(G4LogicalVolume *lv);
-  void fillPV(G4VPhysicalVolume *pv);
-  void dumpSummary(std::ostream &out, std::string name);
-  G4VPhysicalVolume *getTopPV();
+  void update(const BeginOfJob* job) override;
+  void update(const BeginOfRun* run) override;
+  void addSolid(const DDLogicalPart& part);
+  void fillLV(G4LogicalVolume* lv);
+  void fillPV(G4VPhysicalVolume* pv);
+  void dumpSummary(std::ostream& out, std::string name);
+  G4VPhysicalVolume* getTopPV();
   void addName(std::string name);
-  void printSummary(std::ostream &out);
+  void printSummary(std::ostream& out);
 
 private:
   std::vector<std::string> nodeNames_;
   std::map<DDSolidShape, std::string> solidShape_;
   std::map<std::string, DDSolidShape> solidMap_;
-  G4VPhysicalVolume *theTopPV_;
-  std::vector<G4LogicalVolume *> lvs_, touch_;
-  std::vector<G4VSolid *> sls_;
-  std::vector<G4VPhysicalVolume *> pvs_;
-  std::map<DDSolidShape, std::pair<int, int> > kount_;
+  G4VPhysicalVolume* theTopPV_;
+  std::vector<G4LogicalVolume*> lvs_, touch_;
+  std::vector<G4VSolid*> sls_;
+  std::vector<G4VPhysicalVolume*> pvs_;
+  std::map<DDSolidShape, std::pair<int, int>> kount_;
 };
 
 PrintGeomSummary::PrintGeomSummary(const edm::ParameterSet& p) : theTopPV_(nullptr) {