AliTriggerConfiguration: fix for DTRUE and 5 bcmasks

[u/mrichter/AliRoot.git] / PHOS / AliPHOSRecoParam.cxx

diff --git a/PHOS/AliPHOSRecoParam.cxx b/PHOS/AliPHOSRecoParam.cxx
index 9b5aed093d1527bce64ec7ffb03b25c5e14c72a2..1d2ce10a67cae6920d3c6463fa6d45fc9545775d 100644 (file)
--- a/PHOS/AliPHOSRecoParam.cxx
+++ b/PHOS/AliPHOSRecoParam.cxx
@@ -22,6 +22,7 @@
 // --- AliRoot header files ---
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
+#include "AliLog.h"
 #include "AliPHOSRecoParam.h"
 
 ClassImp(AliPHOSRecoParam)
@@ -33,14 +34,18 @@ AliPHOSRecoParam::AliPHOSRecoParam() :
   AliDetectorRecoParam(),
   fEMCClusteringThreshold(0.2),
   fEMCLocMaxCut(0.03),
-  fEMCMinE(0.01),
+  fEMCRawDigitThreshold(2),
+  fEMCMinE(0.012),
   fEMCW0(4.5),
   fEMCSampleQualityCut(1.),
   fEMCEcoreRadius(3.),
   fEMCEcore2ESD(kFALSE),
   fEMCSubtractPedestals(kTRUE),
   fEMCUnfold(kTRUE),
-  fEMCDecoderVersion(""),
+  fEMCEnergyCorrectionOn(kTRUE),
+  fEMCFitterVersion(""),
+  fGlobalAltroOffset(0),
+  fGlobalAltroThreshold(0),
   fCPVClusteringThreshold(0.0),
   fCPVLocMaxCut(0.03),
   fCPVMinE(0.0),
@@ -55,14 +60,18 @@ AliPHOSRecoParam::AliPHOSRecoParam(const AliPHOSRecoParam& ):
   AliDetectorRecoParam(),
   fEMCClusteringThreshold(0.2),
   fEMCLocMaxCut(0.03),
-  fEMCMinE(0.01),
+  fEMCRawDigitThreshold(2),
+  fEMCMinE(0.012),
   fEMCW0(4.5),
   fEMCSampleQualityCut(1.),
   fEMCEcoreRadius(3.),
   fEMCEcore2ESD(kFALSE),
   fEMCSubtractPedestals(kTRUE),
   fEMCUnfold(kTRUE),
-  fEMCDecoderVersion(""),
+  fEMCEnergyCorrectionOn(kTRUE),
+  fEMCFitterVersion(""),
+  fGlobalAltroOffset(0),
+  fGlobalAltroThreshold(0),
   fCPVClusteringThreshold(0.0),
   fCPVLocMaxCut(0.03),
   fCPVMinE(0.0),
@@ -80,6 +89,7 @@ AliPHOSRecoParam& AliPHOSRecoParam::operator = (const AliPHOSRecoParam& recoPara
   if(this != &recoParam) {
     fEMCClusteringThreshold = recoParam.fEMCClusteringThreshold;
     fEMCLocMaxCut           = recoParam.fEMCLocMaxCut;
+    fEMCRawDigitThreshold   = recoParam.fEMCRawDigitThreshold;
     fEMCMinE                = recoParam.fEMCMinE;
     fEMCW0                  = recoParam.fEMCW0;
     fEMCSampleQualityCut    = recoParam.fEMCSampleQualityCut;
@@ -87,7 +97,10 @@ AliPHOSRecoParam& AliPHOSRecoParam::operator = (const AliPHOSRecoParam& recoPara
     fEMCEcore2ESD           = recoParam.fEMCEcore2ESD;
     fEMCSubtractPedestals   = recoParam.fEMCSubtractPedestals;
     fEMCUnfold              = recoParam.fEMCUnfold;
-    fEMCDecoderVersion      = recoParam.fEMCDecoderVersion;
+    fEMCEnergyCorrectionOn  = recoParam.fEMCEnergyCorrectionOn;
+    fEMCFitterVersion       = recoParam.fEMCFitterVersion;
+    fGlobalAltroOffset      = recoParam.fGlobalAltroOffset;
+    fGlobalAltroThreshold   = recoParam.fGlobalAltroThreshold;
     fCPVClusteringThreshold = recoParam.fCPVClusteringThreshold;
     fCPVLocMaxCut           = recoParam.fCPVLocMaxCut;
     fCPVMinE                = recoParam.fCPVMinE;
@@ -98,6 +111,41 @@ AliPHOSRecoParam& AliPHOSRecoParam::operator = (const AliPHOSRecoParam& recoPara
   return *this;
 }
 
+//-----------------------------------------------------------------------------
+void AliPHOSRecoParam::Print(Option_t * /*option*/) const
+{
+  AliDebug(2,Form("PHOS reconstruction parameters:\n"
+                 "\tEMCClusteringThreshold = %f\n"
+                 "\tEMCLocMaxCut           = %f\n"
+                 "\tEMCRawDigitThreshold   = %f\n"
+                 "\tEMCMinE                = %f\n"
+                 "\tEMCW0                  = %f\n"
+                 "\tEMCSampleQualityCut    = %f\n"
+                 "\tEMCEcoreRadius         = %f\n"
+                 "\tEMCEcore2ESD           = %d\n"
+                 "\tEMCSubtractPedestals   = %d\n"
+                 "\tEMCUnfold              = %d\n"
+                 "\tEMCEnergyCorrectionOn  = %d\n"
+                 "\tEMCFitterVersion       = \"%s\"\n"
+                 "\tGlobalAltroOffset      = %d\n"
+                 "\tGlobalAltroThreshold   = %d",
+                 fEMCClusteringThreshold,
+                 fEMCLocMaxCut,
+                 fEMCRawDigitThreshold,
+                 fEMCMinE,
+                 fEMCW0,
+                 fEMCSampleQualityCut,
+                 fEMCEcoreRadius,
+                 fEMCEcore2ESD,
+                 fEMCSubtractPedestals,
+                 fEMCUnfold,
+                 fEMCEnergyCorrectionOn,
+                 fEMCFitterVersion.Data(),
+                 fGlobalAltroOffset,
+                 fGlobalAltroThreshold));
+
+}
+
 //-----------------------------------------------------------------------------
 AliPHOSRecoParam* AliPHOSRecoParam::GetDefaultParameters()
 {
@@ -114,7 +162,7 @@ const TObjArray* AliPHOSRecoParam::GetMappings()
   //If not found, read it from OCDB.
 
   //Quick check as follows:
-  //  root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  //  root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //  root [1] AliCDBManager::Instance()->SetRun(1);
   //  root [2] TObjArray* maps = AliPHOSRecoParam::GetMappings();
   //  root [3] maps->Print();