Correctly handling the "Calibration" events (when scalers are read for MTR

while nothing is done for MCH):
- Added (dummy) Calibration RecoParam in AliMUONRecoParam.
- Ensure that Digits/RecPoints/Tracks are not created for "Calibration" events.
This should solve the problem with missing directories in the QA.
(Diego)

diff --git a/MUON/AliMUONRecoParam.cxx b/MUON/AliMUONRecoParam.cxx
index c967738e5840bf13e768768d08e8fc7c59e068f9..869eacf523932c620fd76d32457076f651a024c3 100644 (file)
--- a/MUON/AliMUONRecoParam.cxx
+++ b/MUON/AliMUONRecoParam.cxx
@@ -77,6 +77,12 @@ AliMUONRecoParam::AliMUONRecoParam()
   /// Constructor
   
   SetNameTitle("Dummy","Dummy");
+  for (Int_t iCh = 0; iCh < 10; iCh++) {
+    fUseChamber[iCh] = kTRUE;
+    fDefaultNonBendingReso[iCh] = 0.;
+    fDefaultBendingReso[iCh] = 0.;
+  }
+  for (Int_t iSt = 0; iSt < 5; iSt++) fRequestStation[iSt] = kTRUE;
   SetDefaultLimits();
 }
 
@@ -145,6 +151,18 @@ AliMUONRecoParam *AliMUONRecoParam::GetCosmicParam()
   return param;
 }
 
+//_____________________________________________________________________________
+AliMUONRecoParam *AliMUONRecoParam::GetCalibrationParam() 
+{
+  /// Return default (dummy) reconstruction parameters for calibration environment
+  
+  AliMUONRecoParam *param = new AliMUONRecoParam();
+  param->SetCalibrationParam();
+  
+  return param;
+}
+
+
 //_____________________________________________________________________________
 void AliMUONRecoParam::SetLowFluxParam() 
 {
@@ -283,6 +301,22 @@ void AliMUONRecoParam::SetCosmicParam()
   
 }
 
+
+//_____________________________________________________________________________
+void AliMUONRecoParam::SetCalibrationParam() 
+{
+  /// Set (dummy) reconstruction parameters for calibration environment
+  
+  SetNameTitle("Calibration","Calibration");
+  SetEventSpecie(AliRecoParam::kCalib);
+
+  fPedMeanLimits[0] = 5000;
+  fPedMeanLimits[1] = 0;
+
+  fPadGoodnessMask = 0x8C00; // Pedestal is missing | is too low | too high
+
+}
+
 //_____________________________________________________________________________
 UInt_t
 AliMUONRecoParam::RequestedStationMask() const

diff --git a/MUON/AliMUONRecoParam.h b/MUON/AliMUONRecoParam.h
index 2b0e060472a8a1f81d7cc943717668dcf3cf7370..2152f91b34c19f3e8f6b8afb8451e2bb5774b387 100644 (file)
--- a/MUON/AliMUONRecoParam.h
+++ b/MUON/AliMUONRecoParam.h
@@ -24,6 +24,7 @@ class AliMUONRecoParam : public AliDetectorRecoParam
   static AliMUONRecoParam *GetLowFluxParam();
   static AliMUONRecoParam *GetHighFluxParam();
   static AliMUONRecoParam *GetCosmicParam();
+  static AliMUONRecoParam *GetCalibrationParam();
   
   /// set the calibration mode (see GetCalibrationMode() for possible modes)
   void SetCalibrationMode(Option_t* mode) { fCalibrationMode = mode; fCalibrationMode.ToUpper();}
@@ -382,7 +383,7 @@ class AliMUONRecoParam : public AliDetectorRecoParam
   void SetLowFluxParam();
   void SetHighFluxParam();
   void SetCosmicParam();
-  
+  void SetCalibrationParam();
   
   ClassDef(AliMUONRecoParam,14) // MUON reco parameters
 };

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 42caec75ad8bbe24bc03e5e2a7a8851440829b5a..01effa9f37c0023d1c1d7d0868a86234fa6259f8 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -198,6 +198,14 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader,
 {
   /// Convert raw data into digit and trigger stores
   CreateDigitMaker();
+
+  // Skip reconstruction if event is Calibration
+  if ( GetRecoParam()->GetEventSpecie() == AliRecoParam::kCalib ) {
+    digitStore->Clear(); // Remove possible digits from previous event
+    triggerStore->Clear(); // Remove possible triggers from previous event
+    AliInfo("Calibration event: do not convert digits");
+    return;
+  }
   
   AliCodeTimerStart(Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)",
                     fDigitMaker->ClassName()))

diff --git a/MUON/MakeMUONRecoParamArray.C b/MUON/MakeMUONRecoParamArray.C
index 966ae60e59d4266e0e2e8254f42caa044d21c666..89f441e321614d80da5d43be64a4ba407ef4d4ac 100644 (file)
--- a/MUON/MakeMUONRecoParamArray.C
+++ b/MUON/MakeMUONRecoParamArray.C
@@ -53,7 +53,7 @@ void MakeMUONRecoParamArray(Int_t startRun = 0, Int_t endRun = AliCDBRunRange::I
   // set RecoParams
   AliMUONRecoParam *param;
   TObjArray recoParams;
-  
+  /*  
   // set parameters for p-p runs
   param = AliMUONRecoParam::GetLowFluxParam();
   recoParams.AddLast(param);
@@ -61,11 +61,16 @@ void MakeMUONRecoParamArray(Int_t startRun = 0, Int_t endRun = AliCDBRunRange::I
   // set parameters for Pb-Pb runs
   param = AliMUONRecoParam::GetHighFluxParam();
   recoParams.AddLast(param);
-  
+  */
+
   // set parameters for cosmic runs
   param = AliMUONRecoParam::GetCosmicParam();
   recoParams.AddLast(param);
-  
+
+  // set (dummy) parameters for calibration runs
+  param = AliMUONRecoParam::GetCalibrationParam();
+  recoParams.AddLast(param);
+
   // identify default parameters (exit if identification failed)
   Bool_t defaultIsSet = kFALSE;
   TIter next(recoParams.MakeIterator());