Adjust macros to new naming defaults

sawenzel · sawenzel · commit 3890e780c791 · 2020-03-20T14:48:38.000+01:00
diff --git a/Detectors/CPV/testsimulation/plot_hit_cpv.C b/Detectors/CPV/testsimulation/plot_hit_cpv.C
@@ -14,14 +14,19 @@
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "CPVBase/Geometry.h"
 #include "CPVBase/Hit.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
+#include "DetectorsCommonDataFormats/DetID.h"
 #endif
 
-void plot_hit_cpv(int ievent = 0, std::string inputfile = "o2sim.root")
+using namespace o2::detectors;
+
+void plot_hit_cpv(int ievent = 0, std::string inputprefix = "o2sim")
 {
   // macros to plot CPV hits
 
   // Hits
-  TFile* file0 = TFile::Open("o2sim.root");
+  std::string inputfile(o2::base::NameConf::getHitsFileName(DetID::CPV, inputprefix));
+  TFile* file0 = TFile::Open(inputfile.c_str());
   std::cout << " Open hits file " << inputfile << std::endl;
   TTree* hitTree = (TTree*)gFile->Get("o2sim");
   std::vector<o2::cpv::Hit>* mHitsArray = nullptr;
diff --git a/Detectors/FIT/FV0/macro/readFV0Hits.C b/Detectors/FIT/FV0/macro/readFV0Hits.C
@@ -19,6 +19,8 @@
 #include <sstream>
 #include "DataFormatsFV0/Hit.h"
 #include "FairLogger.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
+#include "DetectorsCommonDataFormats/DetID.h"
 
 void AdjustStatBox(TH1* h, float x1ndc, float x2ndc, float y1ndc, float y2ndc)
 {
@@ -61,8 +63,10 @@ void InitHistoNames(std::vector<std::string>& vhName, std::vector<int>& vPdg)
   }
 }
 
-void readFV0Hits(std::string simFName = "o2sim.root", UInt_t rebin = 1)
+void readFV0Hits(std::string simPrefix = "o2sim", UInt_t rebin = 1)
 {
+  using namespace o2::detectors;
+  std::string simFName(o2::base::NameConf::getHitsFileName(DetID::FV0, simPrefix));
   gStyle->SetOptStat("noumri");
   const int nCells = 40;
 
diff --git a/Detectors/FIT/macros/readFT0hits.C b/Detectors/FIT/macros/readFT0hits.C
@@ -5,6 +5,8 @@
 #include <TFile.h>
 #include <TH2F.h>
 #include <TTree.h>
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
 
 void readFT0hits()
 {
@@ -25,7 +27,8 @@ void readFT0hits()
 
   gDirectory = cwd;
 
-  TFile* fhit = new TFile("o2sim.root");
+  using namespace o2::detectors;
+  TFile* fhit = new TFile(o2::base::NameConf::getHitsFileName(DetID::FT0, "o2sim").c_str());
   TTree* hitTree = (TTree*)fhit->Get("o2sim");
 
   o2::dataformats::MCEventHeader* mcHeader = nullptr;
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckClusters.C b/Detectors/ITSMFT/ITS/macros/test/CheckClusters.C
@@ -20,7 +20,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #endif
 
-void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")
+void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")
 {
   const int QEDSourceID = 99; // Clusters from this MC source correspond to QED electrons
 
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckDigits.C b/Detectors/ITSMFT/ITS/macros/test/CheckDigits.C
@@ -23,7 +23,7 @@
 
 #endif
 
-void CheckDigits(std::string digifile = "itsdigits.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")
+void CheckDigits(std::string digifile = "itsdigits.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")
 {
 
   using namespace o2::base;
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckTopologies.C b/Detectors/ITSMFT/ITS/macros/test/CheckTopologies.C
@@ -26,7 +26,7 @@
 
 #endif
 
-void CheckTopologies(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root")
+void CheckTopologies(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root")
 {
   using namespace o2::base;
   using namespace o2::its;
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckTracks.C b/Detectors/ITSMFT/ITS/macros/test/CheckTracks.C
@@ -47,7 +47,7 @@ struct DataFrames {
   int lastIndex = -1;
 };
 
-void CheckTracks(std::string tracfile = "o2trac_its.root", std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim.root")
+void CheckTracks(std::string tracfile = "o2trac_its.root", std::string clusfile = "o2clus_its.root", std::string kinefile = "o2sim_Kine.root")
 {
   bool filterMultiROFTracks = 1;
 
@@ -66,7 +66,7 @@ void CheckTracks(std::string tracfile = "o2trac_its.root", std::string clusfile
                             "ipD:ipZ:label");
 
   // MC tracks
-  TFile* file0 = TFile::Open(hitfile.data());
+  TFile* file0 = TFile::Open(kinefile.data());
   TTree* mcTree = (TTree*)gFile->Get("o2sim");
   mcTree->SetBranchStatus("*", 0); //disable all branches
   //mcTree->SetBranchStatus("MCEventHeader.*",1);
diff --git a/Detectors/ITSMFT/ITS/macros/test/DisplayTrack.C b/Detectors/ITSMFT/ITS/macros/test/DisplayTrack.C
@@ -26,7 +26,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #endif
 
-void DisplayTrack(Int_t event = 0, Int_t track = 0, std::string tracfile = "o2trac_its.root", std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root")
+void DisplayTrack(Int_t event = 0, Int_t track = 0, std::string tracfile = "o2trac_its.root", std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root")
 {
   using namespace o2::base;
   using namespace o2::its;
diff --git a/Detectors/ITSMFT/ITS/macros/test/run_buildTopoDict_its.C b/Detectors/ITSMFT/ITS/macros/test/run_buildTopoDict_its.C
@@ -34,7 +34,7 @@
 /// and mean MC hit position is calculated
 
 void run_buildTopoDict_its(std::string clusfile = "o2clus_its.root",
-                           std::string hitfile = "o2sim.root",
+                           std::string hitfile = "o2sim_HitsITS.root",
                            std::string inputGeom = "O2geometry.root")
 {
   const int QEDSourceID = 99; // Clusters from this MC source correspond to QED electrons
diff --git a/Detectors/TOF/prototyping/findTOFclusterFromLabel.C b/Detectors/TOF/prototyping/findTOFclusterFromLabel.C
@@ -87,7 +87,7 @@ void findTOFclusterFromLabel(int trackID, int eventID = 0, int sourceID = 0)
   if (!foundInDigits)
     Printf("The label was NEVER found in the digits");
 
-  TFile* fKine = new TFile("o2sim.root");
+  TFile* fKine = new TFile("o2sim_Kine.root");
   TTree* tKine = (TTree*)fKine->Get("o2sim");
   std::vector<o2::MCTrack>* mcArr = nullptr;
   tKine->SetBranchAddress("MCTrack", &mcArr);
diff --git a/Detectors/TRD/macros/CheckDigits.C b/Detectors/TRD/macros/CheckDigits.C
@@ -29,7 +29,7 @@ using namespace o2::trd;
 constexpr int kMINENTRIES = 1000;
 
 void CheckDigits(std::string digifile = "trddigits.root",
-                 std::string hitfile = "o2sim.root",
+                 std::string hitfile = "o2sim_HitsTRD.root",
                  std::string inputGeom = "O2geometry.root",
                  std::string paramfile = "o2sim_par.root")
 {
diff --git a/Detectors/TRD/macros/CheckHits.C b/Detectors/TRD/macros/CheckHits.C
@@ -22,11 +22,15 @@
 #include "TRDSimulation/Detector.h"
 #include "TRDBase/TRDGeometry.h"
 #include "TRDBase/Calibrations.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
+#include "DetectorsCommonDataFormats/DetID.h"
 #endif
 
+using namespace o2::detectors;
+
 void CheckHits(const int detector = 50, // 354, 14, 242, 50
                std::string digifile = "trddigits.root",
-               std::string hitfile = "o2sim.root",
+               std::string hitfile = "o2sim_HitsTRD.root",
                std::string inputGeom = "O2geometry.root",
                std::string paramfile = "o2sim_par.root")
 {
@@ -102,4 +106,4 @@ void CheckHits(const int detector = 50, // 354, 14, 242, 50
   TCanvas* c3 = new TCanvas("c3", "trd hits analysis", 800, 800);
   h2locClocTnEl->Draw("COL");
   c3->SaveAs("testCheckHits_2D_nEl.pdf");
-}
+}
diff --git a/GPU/GPUTracking/Standalone/qa/GPUQA.cxx b/GPU/GPUTracking/Standalone/qa/GPUQA.cxx
@@ -47,6 +47,7 @@
 #include "SimulationDataFormat/MCTrack.h"
 #include "SimulationDataFormat/TrackReference.h"
 #include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
 #include "TPDGCode.h"
 #include "TParticlePDG.h"
 #include "TDatabasePDG.h"
@@ -412,7 +413,7 @@ int GPUQA::InitQA()
   mkdir("plots", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 
 #ifdef GPUCA_O2_LIB
-  TFile* fileSim = new TFile("o2sim.root");
+  TFile* fileSim = new TFile(o2::base::NameConf::getMCKinematicsFileName("o2sim").c_str());
   TTree* treeSim = (TTree*)fileSim->Get("o2sim");
   std::vector<o2::MCTrack>* tracksX;
   std::vector<o2::TrackReference>* trackRefsX;
diff --git a/macro/CheckClusters_mft.C b/macro/CheckClusters_mft.C
@@ -18,10 +18,13 @@
 #include "MathUtils/Utils.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
 
 #endif
 
 using namespace o2::base;
+using namespace o2::detectors;
 using o2::itsmft::Cluster;
 
 void CheckClusters_mft(Int_t nEvents = 10, Int_t nMuons = 200)
@@ -56,7 +59,7 @@ void CheckClusters_mft(Int_t nEvents = 10, Int_t nMuons = 200)
                                             o2::TransformType::L2G)); // request cached transforms
 
   // Hits
-  sprintf(filename, "o2sim.root");
+  sprintf(filename, NameConf::getHitsFileName(DetID::MFT, "o2sim").c_str());
   TFile* fileH = TFile::Open(filename);
   TTree* hitTree = (TTree*)gFile->Get("o2sim");
   std::vector<Hit>* hitArray = nullptr;
diff --git a/macro/analyzeOriginHits.C b/macro/analyzeOriginHits.C
@@ -148,7 +148,7 @@ class Grid
 template <class... P, typename T>
 Grid(T init, P&&... points)->Grid<sizeof...(P), T>;
 
-void analyzeOriginHits(const char* filename = "o2sim.root",
+void analyzeOriginHits(const char* filename = "o2sim_Kine.root",
                        const std::string& volMapFile = "MCStepLoggerVolMap.dat",
                        const std::string& geomFile = "O2geometry.root",
                        bool ignorePrimaries = false)
diff --git a/macro/readITSDigits.C b/macro/readITSDigits.C
@@ -16,8 +16,7 @@
 
 void readITSDigits(std::string path = "./",
                    std::string digiFName = "itsdigits.root",
-                   std::string runContextFName = "collisioncontext.root",
-                   std::string mctruthFName = "o2sim.root")
+                   std::string runContextFName = "collisioncontext.root")
 {
   if (path.back() != '/') {
     path += '/';
diff --git a/macro/run_primary_vertexer_ITS.C b/macro/run_primary_vertexer_ITS.C
@@ -33,7 +33,7 @@ int run_primary_vertexer_ITS(const bool useMCcheck = false,
                              const GPUDataTypes::DeviceType dtype = GPUDataTypes::DeviceType::HIP,
                              const std::string inputClustersITS = "o2clus_its.root",
                              const std::string inputGRP = "o2sim_grp.root",
-                             const std::string simfilename = "o2sim.root",
+                             const std::string simfilename = "o2sim_Kine.root",
                              const std::string paramfilename = "O2geometry.root",
                              const std::string path = "./")
 {
diff --git a/macro/run_trac_ca_its.C b/macro/run_trac_ca_its.C
@@ -54,8 +54,7 @@ using MCLabCont = o2::dataformats::MCTruthContainer<o2::MCCompLabel>;
 void run_trac_ca_its(std::string path = "./",
                      std::string outputfile = "o2trac_its.root",
                      std::string inputClustersITS = "o2clus_its.root", std::string inputGeom = "O2geometry.root",
-                     std::string inputGRP = "o2sim_grp.root", std::string simfilename = "o2sim.root",
-                     std::string paramfilename = "o2sim_par.root")
+                     std::string inputGRP = "o2sim_grp.root")
 {
 
   gSystem->Load("libO2ITStracking.so");
diff --git a/macro/run_trac_its.C b/macro/run_trac_its.C
@@ -39,7 +39,7 @@ using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;
 
 void run_trac_its(std::string path = "./", std::string outputfile = "o2trac_its.root",
                   std::string inputClustersITS = "o2clus_its.root", std::string inputGeom = "O2geometry.root",
-                  std::string inputGRP = "o2sim_grp.root", std::string simfilename = "o2sim.root")
+                  std::string inputGRP = "o2sim_grp.root")
 {
 
   FairLogger* logger = FairLogger::GetLogger();

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`#include <sstream>`
`20`	`20`	`#include "DataFormatsFV0/Hit.h"`
`21`	`21`	`#include "FairLogger.h"`
	`22`	`+#include "DetectorsCommonDataFormats/NameConf.h"`
	`23`	`+#include "DetectorsCommonDataFormats/DetID.h"`
`22`	`24`
`23`	`25`	`void AdjustStatBox(TH1* h, float x1ndc, float x2ndc, float y1ndc, float y2ndc)`
`24`	`26`	`{`
`@@ -61,8 +63,10 @@ void InitHistoNames(std::vector<std::string>& vhName, std::vector<int>& vPdg)`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`
`64`		`-void readFV0Hits(std::string simFName = "o2sim.root", UInt_t rebin = 1)`
	`66`	`+void readFV0Hits(std::string simPrefix = "o2sim", UInt_t rebin = 1)`
`65`	`67`	`{`
	`68`	`+ using namespace o2::detectors;`
	`69`	`+ std::string simFName(o2::base::NameConf::getHitsFileName(DetID::FV0, simPrefix));`
`66`	`70`	`gStyle->SetOptStat("noumri");`
`67`	`71`	`const int nCells = 40;`
`68`	`72`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include "SimulationDataFormat/MCTruthContainer.h"`
`21`	`21`	`#endif`
`22`	`22`
`23`		`-void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")`
	`23`	`+void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")`
`24`	`24`	`{`
`25`	`25`	`const int QEDSourceID = 99; // Clusters from this MC source correspond to QED electrons`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`#endif`
`25`	`25`
`26`		`-void CheckDigits(std::string digifile = "itsdigits.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")`
	`26`	`+void CheckDigits(std::string digifile = "itsdigits.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root", std::string paramfile = "o2sim_par.root")`
`27`	`27`	`{`
`28`	`28`
`29`	`29`	`using namespace o2::base;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`#endif`
`28`	`28`
`29`		`-void CheckTopologies(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim.root", std::string inputGeom = "O2geometry.root")`
	`29`	`+void CheckTopologies(std::string clusfile = "o2clus_its.root", std::string hitfile = "o2sim_HitsITS.root", std::string inputGeom = "O2geometry.root")`
`30`	`30`	`{`
`31`	`31`	`using namespace o2::base;`
`32`	`32`	`using namespace o2::its;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`/// and mean MC hit position is calculated`
`35`	`35`
`36`	`36`	`void run_buildTopoDict_its(std::string clusfile = "o2clus_its.root",`
`37`		`- std::string hitfile = "o2sim.root",`
	`37`	`+ std::string hitfile = "o2sim_HitsITS.root",`
`38`	`38`	`std::string inputGeom = "O2geometry.root")`
`39`	`39`	`{`
`40`	`40`	`const int QEDSourceID = 99; // Clusters from this MC source correspond to QED electrons`