Fix loading bunch filling (due to name change)

sawenzel · sawenzel · commit 84a110c8b3c4 · 2022-08-18T20:24:47.000+02:00
diff --git a/DataFormats/Parameters/src/GRPTool.cxx b/DataFormats/Parameters/src/GRPTool.cxx
@@ -319,8 +319,12 @@ bool create_GRPs(Options const& opts)
 
     // set the BC pattern if necessary
     if (opts.bcPatternFile.size() > 0) {
-      // load bunch filling from the file
-      auto* bc = o2::BunchFilling::loadFrom(opts.bcPatternFile);
+      // load bunch filling from the file (with standard CCDB convention)
+      auto* bc = o2::BunchFilling::loadFrom(opts.bcPatternFile, "ccdb_object");
+      if (!bc) {
+        // if it failed, retry with default naming
+        bc = o2::BunchFilling::loadFrom(opts.bcPatternFile);
+      }
       if (!bc) {
         LOG(fatal) << "Failed to load bunch filling from " << opts.bcPatternFile;
       }
diff --git a/Steer/src/InteractionSampler.cxx b/Steer/src/InteractionSampler.cxx
@@ -134,7 +134,10 @@ int InteractionSampler::simulateInteractingBC()
 void InteractionSampler::setBunchFilling(const std::string& bcFillingFile)
 {
   // load bunch filling from the file
-  auto* bc = o2::BunchFilling::loadFrom(bcFillingFile);
+  auto* bc = o2::BunchFilling::loadFrom(bcFillingFile, "ccdb_object");
+  if (!bc) {
+    bc = o2::BunchFilling::loadFrom(bcFillingFile); // retry with default naming in case of failure
+  }
   if (!bc) {
     LOG(fatal) << "Failed to load bunch filling from " << bcFillingFile;
   }

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,10 @@ int InteractionSampler::simulateInteractingBC()`
`134`	`134`	`void InteractionSampler::setBunchFilling(const std::string& bcFillingFile)`
`135`	`135`	`{`
`136`	`136`	`// load bunch filling from the file`
`137`		`- auto* bc = o2::BunchFilling::loadFrom(bcFillingFile);`
	`137`	`+ auto* bc = o2::BunchFilling::loadFrom(bcFillingFile, "ccdb_object");`
	`138`	`+ if (!bc) {`
	`139`	`+ bc = o2::BunchFilling::loadFrom(bcFillingFile); // retry with default naming in case of failure`
	`140`	`+ }`
`138`	`141`	`if (!bc) {`
`139`	`142`	`LOG(fatal) << "Failed to load bunch filling from " << bcFillingFile;`
`140`	`143`	`}`