fatal error in case OCDB entry with alignment objects is not found for one or more...

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

diff --git a/PHOS/AliPHOSRecoParam.cxx b/PHOS/AliPHOSRecoParam.cxx
index f62aab4afe7a47ce90a9f51a61b3643692574adb..ce326e2719f82d6c6ad1fcf98d0962cafd6f94a9 100644 (file)
--- a/PHOS/AliPHOSRecoParam.cxx
+++ b/PHOS/AliPHOSRecoParam.cxx
@@ -34,7 +34,8 @@ AliPHOSRecoParam::AliPHOSRecoParam() :
   AliDetectorRecoParam(),
   fEMCClusteringThreshold(0.2),
   fEMCLocMaxCut(0.03),
-  fEMCMinE(0.01),
+  fEMCRawDigitThreshold(2),
+  fEMCMinE(0.012),
   fEMCW0(4.5),
   fEMCSampleQualityCut(1.),
   fEMCEcoreRadius(3.),
@@ -42,8 +43,9 @@ AliPHOSRecoParam::AliPHOSRecoParam() :
   fEMCSubtractPedestals(kTRUE),
   fEMCUnfold(kTRUE),
   fEMCEnergyCorrectionOn(kTRUE),
-  fEMCDecoderVersion(""),
+  fEMCFitterVersion(""),
   fGlobalAltroOffset(0),
+  fGlobalAltroThreshold(0),
   fCPVClusteringThreshold(0.0),
   fCPVLocMaxCut(0.03),
   fCPVMinE(0.0),
@@ -58,7 +60,8 @@ 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.),
@@ -66,8 +69,9 @@ AliPHOSRecoParam::AliPHOSRecoParam(const AliPHOSRecoParam& ):
   fEMCSubtractPedestals(kTRUE),
   fEMCUnfold(kTRUE),
   fEMCEnergyCorrectionOn(kTRUE),
-  fEMCDecoderVersion(""),
+  fEMCFitterVersion(""),
   fGlobalAltroOffset(0),
+  fGlobalAltroThreshold(0),
   fCPVClusteringThreshold(0.0),
   fCPVLocMaxCut(0.03),
   fCPVMinE(0.0),
@@ -85,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;
@@ -93,8 +98,9 @@ AliPHOSRecoParam& AliPHOSRecoParam::operator = (const AliPHOSRecoParam& recoPara
     fEMCSubtractPedestals   = recoParam.fEMCSubtractPedestals;
     fEMCUnfold              = recoParam.fEMCUnfold;
     fEMCEnergyCorrectionOn  = recoParam.fEMCEnergyCorrectionOn;
-    fEMCDecoderVersion      = recoParam.fEMCDecoderVersion;
+    fEMCFitterVersion       = recoParam.fEMCFitterVersion;
     fGlobalAltroOffset      = recoParam.fGlobalAltroOffset;
+    fGlobalAltroThreshold   = recoParam.fGlobalAltroThreshold;
     fCPVClusteringThreshold = recoParam.fCPVClusteringThreshold;
     fCPVLocMaxCut           = recoParam.fCPVLocMaxCut;
     fCPVMinE                = recoParam.fCPVMinE;
@@ -106,11 +112,12 @@ AliPHOSRecoParam& AliPHOSRecoParam::operator = (const AliPHOSRecoParam& recoPara
 }
 
 //-----------------------------------------------------------------------------
-void AliPHOSRecoParam::Print(Option_t *option) const
+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"
@@ -119,10 +126,12 @@ void AliPHOSRecoParam::Print(Option_t *option) const
                  "\tEMCSubtractPedestals   = %d\n"
                  "\tEMCUnfold              = %d\n"
                  "\tEMCEnergyCorrectionOn  = %d\n"
-                 "\tEMCDecoderVersion      = \"%s\"\n"
+                 "\tEMCFitterVersion       = \"%s\"\n"
                  "\tGlobalAltroOffset      = %d",
+                 "\tGlobalAltroThreshold   = %d",
                  fEMCClusteringThreshold,
                  fEMCLocMaxCut,
+                 fEMCRawDigitThreshold,
                  fEMCMinE,
                  fEMCW0,
                  fEMCSampleQualityCut,
@@ -131,8 +140,9 @@ void AliPHOSRecoParam::Print(Option_t *option) const
                  fEMCSubtractPedestals,
                  fEMCUnfold,
                  fEMCEnergyCorrectionOn,
-                 fEMCDecoderVersion.Data(),
-                 fGlobalAltroOffset));
+                 fEMCFitterVersion.Data(),
+                 fGlobalAltroOffset,
+                 fGlobalAltroThreshold));
 
 }
 
@@ -152,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();