fix default gain map, allow for local gain map file

matthias-kleiner · sawenzel · commit ff944c954616 · 2019-06-12T14:07:41.000+02:00
diff --git a/Detectors/TPC/base/src/CDBInterface.cxx b/Detectors/TPC/base/src/CDBInterface.cxx
@@ -257,8 +257,8 @@ void CDBInterface::createDefaultGainMap()
       if (random < minGain) {
         random = minGain;
       }
-      if (random > minGain) {
-        random = minGain;
+      if (random > maxGain) {
+        random = maxGain;
       }
       val = random;
     }
diff --git a/Steer/DigitizerWorkflow/src/TPCDigitizerSpec.cxx b/Steer/DigitizerWorkflow/src/TPCDigitizerSpec.cxx
@@ -17,6 +17,7 @@
 #include "TStopwatch.h"
 #include "Steer/HitProcessingManager.h" // for RunContext
 #include "TChain.h"
+#include "TSystem.h"
 #include <SimulationDataFormat/MCCompLabel.h>
 #include <SimulationDataFormat/MCTruthContainer.h>
 #include "Framework/Task.h"
@@ -159,6 +160,10 @@ class TPCDPLDigitizerTask
     /// For the time being use the defaults for the CDB
     auto& cdb = o2::tpc::CDBInterface::instance();
     cdb.setUseDefaults();
+    if (!gSystem->AccessPathName("GainMap.root")) {
+      LOG(INFO) << "TPC: Using gain map from 'GainMap.root'" << FairLogger::endl;
+      cdb.setGainMapFromFile("GainMap.root");
+    }
 
     // read collision context from input
     auto context = pc.inputs().get<o2::steer::RunContext*>("collisioncontext");

Original file line number	Diff line number	Diff line change
`@@ -257,8 +257,8 @@ void CDBInterface::createDefaultGainMap()`
`257`	`257`	`if (random < minGain) {`
`258`	`258`	`random = minGain;`
`259`	`259`	`}`
`260`		`- if (random > minGain) {`
`261`		`- random = minGain;`
	`260`	`+ if (random > maxGain) {`
	`261`	`+ random = maxGain;`
`262`	`262`	`}`
`263`	`263`	`val = random;`
`264`	`264`	`}`