Digitizer workflow: Ability to use arbitrary GRP file

sawenzel · sawenzel · commit f4177bd0fbf5 · 2020-02-28T21:05:15.000+01:00
This commit fixes a problem in the digitizer workflow.
Up until now, this was only working with files named "o2sim.root"
and "o2sim_grp.root". Now it is possible to use arbitrary names

```
o2-sim-digitizer-workflow --GRP o2simTRD_grp.root --simFile o2simTRD.root -b --onlyDet TRD
```
diff --git a/Steer/DigitizerWorkflow/src/GRPUpdaterSpec.cxx b/Steer/DigitizerWorkflow/src/GRPUpdaterSpec.cxx
@@ -38,22 +38,23 @@ class GRPDPLUpdatedTask
   using GRP = o2::parameters::GRPObject;
 
  public:
+  GRPDPLUpdatedTask(const std::string& grpfilename) : mGRPFileName{grpfilename} {}
+
   void init(framework::InitContext& ic)
   {
     // nothing special to be set up
   }
 
   void run(framework::ProcessingContext& pc)
   {
-    const std::string inputGRP = "o2sim_grp.root";
     const std::string grpName = "GRP";
     if (mFinished) {
       return;
     }
 
-    TFile flGRP(inputGRP.c_str(), "update");
+    TFile flGRP(mGRPFileName.c_str(), "update");
     if (flGRP.IsZombie()) {
-      LOG(ERROR) << "Failed to open  in update mode " << inputGRP;
+      LOG(ERROR) << "Failed to open  in update mode " << mGRPFileName;
       return;
     }
     std::unique_ptr<GRP> grp(static_cast<GRP*>(flGRP.GetObjectChecked(grpName.c_str(), GRP::Class())));
@@ -65,7 +66,7 @@ class GRPDPLUpdatedTask
       }
       grp->setDetROMode(det, roMode);
     }
-    LOG(INFO) << "Updated GRP in " << inputGRP << " for detectors RO mode";
+    LOG(INFO) << "Updated GRP in " << mGRPFileName << " for detectors RO mode";
     grp->print();
     flGRP.WriteObjectAny(grp.get(), grp->Class(), grpName.c_str());
     flGRP.Close();
@@ -76,10 +77,11 @@ class GRPDPLUpdatedTask
 
  private:
   bool mFinished = false;
+  std::string mGRPFileName = "o2sim_grp.root";
 };
 
 /// create the processor spec
-o2::framework::DataProcessorSpec getGRPUpdaterSpec(const std::vector<o2::detectors::DetID>& detList)
+o2::framework::DataProcessorSpec getGRPUpdaterSpec(const std::string& grpfilename, const std::vector<o2::detectors::DetID>& detList)
 {
   sDetList = detList;
   static constexpr std::array<o2::header::DataOrigin, o2::detectors::DetID::nDetectors> sOrigins = {
@@ -101,7 +103,7 @@ o2::framework::DataProcessorSpec getGRPUpdaterSpec(const std::vector<o2::detecto
     "GRPUpdater",
     inputs, // input status from each detector
     {},     // no output
-    AlgorithmSpec{adaptFromTask<GRPDPLUpdatedTask>()},
+    AlgorithmSpec{adaptFromTask<GRPDPLUpdatedTask>(grpfilename)},
     Options{/* for the moment no options */}};
 }
 
diff --git a/Steer/DigitizerWorkflow/src/GRPUpdaterSpec.h b/Steer/DigitizerWorkflow/src/GRPUpdaterSpec.h
@@ -21,7 +21,7 @@ namespace parameters
 {
 
 o2::framework::DataProcessorSpec
-  getGRPUpdaterSpec(const std::vector<o2::detectors::DetID>& detList);
+  getGRPUpdaterSpec(const std::string& grpfilename, const std::vector<o2::detectors::DetID>& detList);
 
 } // end namespace parameters
 } // end namespace o2
diff --git a/Steer/DigitizerWorkflow/src/SimpleDigitizerWorkflow.cxx b/Steer/DigitizerWorkflow/src/SimpleDigitizerWorkflow.cxx
@@ -134,6 +134,10 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
   workflowOptions.push_back(
     ConfigParamSpec{"tpc-reco-type", VariantType::String, "", {tpcrthelp}});
 
+  std::string grphelp("GRP file describing the simulation");
+  workflowOptions.push_back(
+    ConfigParamSpec{"GRP", VariantType::String, "o2sim_grp.root", {grphelp}});
+
   // option allowing to set parameters
   std::string keyvaluehelp("Semicolon separated key=value strings (e.g.: 'TPC.gasDensity=1;...')");
   workflowOptions.push_back(
@@ -314,7 +318,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
 
   // First, read the GRP to detect which components need instantiations
   // (for the moment this assumes the file o2sim_grp.root to be in the current directory)
-  const auto grp = readGRP();
+  const auto grp = readGRP(configcontext.options().get<std::string>("GRP"));
   if (!grp) {
     return WorkflowSpec{};
   }
@@ -509,7 +513,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   }
 
   // GRP updater: must come after all detectors since requires their list
-  specs.emplace_back(o2::parameters::getGRPUpdaterSpec(detList));
+  specs.emplace_back(o2::parameters::getGRPUpdaterSpec(configcontext.options().get<std::string>("GRP"), detList));
 
   // The SIM Reader. NEEDS TO BE LAST
   specs[0] = o2::steer::getSimReaderSpec(fanoutsize, tpcsectors, tpclanes);

Original file line number	Diff line number	Diff line change
`@@ -38,22 +38,23 @@ class GRPDPLUpdatedTask`
`38`	`38`	`using GRP = o2::parameters::GRPObject;`
`39`	`39`
`40`	`40`	`public:`
	`41`	`+ GRPDPLUpdatedTask(const std::string& grpfilename) : mGRPFileName{grpfilename} {}`
	`42`	`+`
`41`	`43`	`void init(framework::InitContext& ic)`
`42`	`44`	`{`
`43`	`45`	`// nothing special to be set up`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`void run(framework::ProcessingContext& pc)`
`47`	`49`	`{`
`48`		`- const std::string inputGRP = "o2sim_grp.root";`
`49`	`50`	`const std::string grpName = "GRP";`
`50`	`51`	`if (mFinished) {`
`51`	`52`	`return;`
`52`	`53`	`}`
`53`	`54`
`54`		`- TFile flGRP(inputGRP.c_str(), "update");`
	`55`	`+ TFile flGRP(mGRPFileName.c_str(), "update");`
`55`	`56`	`if (flGRP.IsZombie()) {`
`56`		`- LOG(ERROR) << "Failed to open in update mode " << inputGRP;`
	`57`	`+ LOG(ERROR) << "Failed to open in update mode " << mGRPFileName;`
`57`	`58`	`return;`
`58`	`59`	`}`
`59`	`60`	`std::unique_ptr<GRP> grp(static_cast<GRP*>(flGRP.GetObjectChecked(grpName.c_str(), GRP::Class())));`
`@@ -65,7 +66,7 @@ class GRPDPLUpdatedTask`
`65`	`66`	`}`
`66`	`67`	`grp->setDetROMode(det, roMode);`
`67`	`68`	`}`
`68`		`- LOG(INFO) << "Updated GRP in " << inputGRP << " for detectors RO mode";`
	`69`	`+ LOG(INFO) << "Updated GRP in " << mGRPFileName << " for detectors RO mode";`
`69`	`70`	`grp->print();`
`70`	`71`	`flGRP.WriteObjectAny(grp.get(), grp->Class(), grpName.c_str());`
`71`	`72`	`flGRP.Close();`
`@@ -76,10 +77,11 @@ class GRPDPLUpdatedTask`
`76`	`77`
`77`	`78`	`private:`
`78`	`79`	`bool mFinished = false;`
	`80`	`+ std::string mGRPFileName = "o2sim_grp.root";`
`79`	`81`	`};`
`80`	`82`
`81`	`83`	`/// create the processor spec`
`82`		`-o2::framework::DataProcessorSpec getGRPUpdaterSpec(const std::vector<o2::detectors::DetID>& detList)`
	`84`	`+o2::framework::DataProcessorSpec getGRPUpdaterSpec(const std::string& grpfilename, const std::vector<o2::detectors::DetID>& detList)`
`83`	`85`	`{`
`84`	`86`	`sDetList = detList;`
`85`	`87`	`static constexpr std::array<o2::header::DataOrigin, o2::detectors::DetID::nDetectors> sOrigins = {`
`@@ -101,7 +103,7 @@ o2::framework::DataProcessorSpec getGRPUpdaterSpec(const std::vector<o2::detecto`
`101`	`103`	`"GRPUpdater",`
`102`	`104`	`inputs, // input status from each detector`
`103`	`105`	`{}, // no output`
`104`		`- AlgorithmSpec{adaptFromTask<GRPDPLUpdatedTask>()},`
	`106`	`+ AlgorithmSpec{adaptFromTask<GRPDPLUpdatedTask>(grpfilename)},`
`105`	`107`	`Options{/* for the moment no options */}};`
`106`	`108`	`}`
`107`	`109`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace parameters`
`21`	`21`	`{`
`22`	`22`
`23`	`23`	`o2::framework::DataProcessorSpec`
`24`		`- getGRPUpdaterSpec(const std::vector<o2::detectors::DetID>& detList);`
	`24`	`+ getGRPUpdaterSpec(const std::string& grpfilename, const std::vector<o2::detectors::DetID>& detList);`
`25`	`25`
`26`	`26`	`} // end namespace parameters`
`27`	`27`	`} // end namespace o2`