- Trigger chamber efficiency will be used by default when creating AliMUON

[u/mrichter/AliRoot.git] / MUON / AliMUON.cxx

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 171ee97d07ce86dbf9df7f1cfac2d333560237e6..e9573254f32a7c748aa92386412f1a5636ac51d0 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -22,15 +22,17 @@
 // providing simulation data management 
 //-----------------------------------------------------------------------------
 
+#include <TTree.h>
 #include "AliMUON.h"
 
 #include "AliMUONSDigitizerV2.h"
 #include "AliMUONDigitizerV3.h"
 #include "AliMUONDigitMaker.h"
+#include "AliMUONDigit.h"
 #include "AliMUONCalibrationData.h"
 
 #include "AliMUONDigitStoreV1.h"
-#include "AliMUONVTriggerStore.h"
+#include "AliMUONTriggerStoreV1.h"
 #include "AliMUONHitStoreV1.h"
 
 #include "AliMUONChamberTrigger.h"
@@ -44,12 +46,16 @@
 #include "AliMUONSt2GeometryBuilderV2.h"
 #include "AliMUONSlatGeometryBuilder.h"
 #include "AliMUONTriggerGeometryBuilder.h"
+#include "AliMUONDigitCalibrator.h"
+#include "AliMUONRecoParam.h"
+#include "AliCDBManager.h"
+#include "AliCDBEntry.h"
 
 #include "AliMUONRawWriter.h"
 
 #include "AliLoader.h"
 #include "AliCDBManager.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliMC.h"
 #include "AliRun.h"
 #include "AliRawDataHeaderSim.h"
@@ -96,15 +102,17 @@ AliMUON::AliMUON()
     fTriggerScalerEvent(kFALSE),
     fTriggerResponseV1(kFALSE),
     fTriggerCoinc44(0),
-    fTriggerEffCells(0),
+    fTriggerEffCells(kTRUE),
     fDigitizerWithNoise(1),
     fDigitizerNSigmas(4.0),
     fIsTailEffect(kTRUE),
+    fConvertTrigger(kFALSE),
     fRawWriter(0x0),
     fDigitMaker(0x0),
     fHitStore(0x0),
     fDigitStoreConcreteClassName(),
-    fCalibrationData(0x0)
+    fCalibrationData(0x0),
+    fDigitCalibrator(0x0)
 {
 /// Default Constructor
     
@@ -133,15 +141,17 @@ AliMUON::AliMUON(const char *name, const char* title)
     fTriggerScalerEvent(kFALSE),
     fTriggerResponseV1(kFALSE),
     fTriggerCoinc44(0),
-    fTriggerEffCells(0),
+    fTriggerEffCells(kTRUE),
     fDigitizerWithNoise(1),
     fDigitizerNSigmas(4.0),
     fIsTailEffect(kTRUE),
+    fConvertTrigger(kFALSE),
     fRawWriter(0x0),
     fDigitMaker(new AliMUONDigitMaker),
     fHitStore(0x0),
     fDigitStoreConcreteClassName("AliMUONDigitStoreV2S"),
-    fCalibrationData()
+    fCalibrationData(),
+    fDigitCalibrator(0x0)
 {
   /// Standard constructor  
   
@@ -205,6 +215,7 @@ AliMUON::~AliMUON()
   delete fDigitMaker;
   delete fHitStore;
   delete fCalibrationData;
+  delete fDigitCalibrator;
 }
 
 //_____________________________________________________________________________
@@ -428,13 +439,13 @@ void   AliMUON::SetResponseModel(Int_t id, const AliMUONResponse& response)
 }
 
 //____________________________________________________________________
-AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliMUON::CreateDigitizer(AliDigitizationInput* digInput) const
 {
 /// Return digitizer
   
-  AliMUONDigitizerV3* digitizer = new AliMUONDigitizerV3(manager, fDigitizerWithNoise);
+  AliMUONDigitizerV3* digitizer = new AliMUONDigitizerV3(digInput, fDigitizerWithNoise);
   AliMUONDigitizerV3::SetNSigmas(fDigitizerNSigmas);
-  digitizer->SetCalibrationData(fCalibrationData);
+  digitizer->SetCalibrationData(fCalibrationData,GetRecoParam());
   return digitizer;
 }
 
@@ -455,7 +466,7 @@ void AliMUON::Hits2SDigits()
 /// Perform Hits2Digits using SDigitizerV2
   
   AliMUONSDigitizerV2 sdigitizer;
-  sdigitizer.ExecuteTask();
+  sdigitizer.Digitize();
 }
 
 //_____________________________________________________________________
@@ -508,23 +519,61 @@ void AliMUON::Digits2Raw()
 //_____________________________________________________________________
 Bool_t AliMUON::Raw2SDigits(AliRawReader* rawReader)
 {
-/// Convert  raw data to SDigit
-
-  fLoader->LoadDigits("READ");
+  /// Convert raw data to SDigit
+  
   if (!fLoader->TreeS()) fLoader->MakeSDigitsContainer();
-
+  
   TTree* treeS = fLoader->TreeS();
   
-  AliMUONVDigitStore* sDigitStore = new AliMUONDigitStoreV1;
+  AliMUONVDigitStore* sDigitStore = AliMUONVDigitStore::Create(DigitStoreClassName());
+       AliMUONVTriggerStore* triggerStore = 0x0;
+       
   sDigitStore->Connect(*treeS);
+       
+  if (!fDigitMaker) fDigitMaker = new AliMUONDigitMaker;
+       
+       if (fConvertTrigger) {
+               triggerStore = new AliMUONTriggerStoreV1;
+               triggerStore->Connect(*treeS,true);
+               fDigitMaker->SetMakeTriggerDigits(true);
+       }
+       
+  if (!fDigitCalibrator)
+  {
+    AliMUONRecoParam* recoParam = GetRecoParam();
+    
+    if (!recoParam)
+    {
+      AliFatal("Cannot work without recoparams !");
+    }
+    
+    fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,recoParam);
+  }
+  
+       fDigitMaker->Raw2Digits(rawReader,sDigitStore,triggerStore);
   
-  fDigitMaker->Raw2Digits(rawReader,sDigitStore,0x0);
+  fDigitCalibrator->Calibrate(*sDigitStore);
 
+  TIter next(sDigitStore->CreateIterator());
+  AliMUONDigit* sdigit;
+  
+  // now tweak the digits to make them "as fresh as possible", i.e.
+  // reset their calibrated status, as they'll be calibrated again
+  // once embedded.
+  while ( ( sdigit = static_cast<AliMUONDigit*>(next()) ) )
+  {
+    sdigit->Calibrated(kFALSE);
+  }
+  
+  treeS->Fill();
+  
   fLoader->WriteSDigits("OVERWRITE");
-
+  
   fLoader->UnloadSDigits();
-
+  
   delete sDigitStore;
+       
+       delete triggerStore;
   
   return kTRUE;
 }
@@ -598,4 +647,29 @@ Int_t  AliMUON::GetDigitizerWithNoise() const
     
 }  
 
+//____________________________________________________________________
+AliMUONRecoParam* AliMUON::GetRecoParam() const
+{
+  AliMUONRecoParam* recoParam = 0x0;
+
+  AliCDBEntry* entry = AliCDBManager::Instance()->Get("MUON/Calib/RecoParam");
+
+  if (entry) 
+  {      
+    // load recoParam according OCDB content (single or array)
+    if (!(recoParam = dynamic_cast<AliMUONRecoParam*>(entry->GetObject()))) 
+    {        
+      TObjArray* recoParamArray = static_cast<TObjArray*>(entry->GetObject());
+      
+      for(Int_t i = 0; i < recoParamArray->GetEntriesFast(); ++i)
+      {
+        recoParam = static_cast<AliMUONRecoParam*>(recoParamArray->UncheckedAt(i));
+        if (recoParam && recoParam->IsDefault()) break;
+        recoParam = 0x0;
+      }        
+    }      
+  }
+  return recoParam;
+}
+