chore: Cleanup includes in FairModule

Author: ChristianTackeGSI

fairroot/base/sim/FairModule.cxx

@@ -10,6 +10,7 @@
 // -----            Created 06/01/04  by M. Al-Turany                  -----
 // -------------------------------------------------------------------------
 /* Generated by Together */
+
 #include "FairModule.h"
 
 #include "FairGeoBuilder.h"     // for FairGeoBuilder
@@ -30,28 +31,20 @@
 #include <TFile.h>             // for TFile
 #include <TGeoManager.h>       // for TGeoManager, gGeoManager
 #include <TGeoMaterial.h>      // for TGeoMaterial
-#include <TGeoMatrix.h>        // for TGeoMatrix, TGeoHMatrix
 #include <TGeoMedium.h>        // for TGeoMedium
-#include <TGeoNode.h>          // for TGeoNode
-#include <TGeoVolume.h>        // for TGeoVolume
 #include <TGeoVoxelFinder.h>   // for TGeoVoxelFinder
 #include <TKey.h>              // for TKey
-#include <TList.h>             // for TList, TListIter
 #include <TObjArray.h>         // for TObjArray
 #include <TObject.h>           // for TObject
-#include <TRefArray.h>         // for TRefArray
 #include <TSystem.h>           // for TSystem, gSystem
-#include <TVirtualMC.h>
 
 #ifdef ROOT_HAS_GDML
 #include <TGDMLParse.h>
 #endif
 
+#include <cstdlib>   // for getenv
+#include <cstring>   // for strcmp, strlen
 #include <map>
-#include <stdlib.h>   // for getenv
-#include <string.h>   // for strcmp, strlen
-
-class FairGeoMedium;
 
 void FairModule::ConstructGeometry()
 {
@@ -213,7 +206,6 @@ void FairModule::SetGeometryFileName(TString fname, TString)
     // File not found
     LOG(fatal) << fName << ": geometry file " << fname << " not found in standard path ";
     fgeoName = "";
-    return;
 }
 
 void FairModule::ProcessNodes(TList* aList)
@@ -268,7 +260,6 @@ void FairModule::ProcessNodes(TList* aList)
 
 void FairModule::AddSensitiveVolume(TGeoVolume* v)
 {
-
     LOG(debug2) << "AddSensitiveVolume " << v->GetName();
 
     // Only register volumes which are not already registered
@@ -293,7 +284,6 @@ FairVolume* FairModule::getFairVolume(FairGeoNode* fN)
         if ((fv->getGeoNode()) == fN) {
             fvol = fv;
             return fvol;
-            break;
         }
     }
     return fvol;

fairroot/base/sim/FairModule.h

@@ -16,21 +16,19 @@
 #include "FairRun.h"         // for FairRun
 #include "FairRuntimeDb.h"   // for FairRuntimeDb
 
-#include <Rtypes.h>      // for Bool_t, Int_t, etc
+#include <TGeoMatrix.h>
+#include <TGeoNode.h>
+#include <TGeoVolume.h>
 #include <TList.h>       // for TList (ptr only), TListIter
 #include <TNamed.h>      // for TNamed
 #include <TObjArray.h>   // for TObjArray
+#include <TRefArray.h>   // for TRefArray
 #include <TString.h>     // for TString, operator!=
-#include <string>        // for string
+#include <TVirtualMC.h>
+#include <string>
 
 class FairVolumeList;
 class FairVolume;
-class TArrayI;
-class TGeoMatrix;
-class TGeoNode;
-class TGeoVolume;
-class TRefArray;
-class TVirtualMC;
 
 /**
  * Base class for constructing all detecors and passive volumes
@@ -137,11 +135,11 @@ class FairModule : public TNamed
     TList* GetListOfGeoPar() { return flGeoPar; }
 
     /**list of volumes in a simulation session*/
-    static thread_local inline FairVolumeList* vList{0};   //!
+    static thread_local inline FairVolumeList* vList{nullptr};   //!
     /**total number of volumes in a simulaion session*/
     static thread_local inline Int_t fNbOfVolumes{0};   //!
     /**list of all sensitive volumes in  a simulaion session*/
-    static thread_local inline TRefArray* svList{0};   //!
+    static thread_local inline TRefArray* svList{nullptr};   //!
 
     TString fMotherVolumeName{""};   //!
     FairVolume* getFairVolume(FairGeoNode* fNode);