X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONReconstructor.cxx;h=1acf4b07b96ded65589ed1788a94ee8b4269c807;hb=da2d199e7a43dca38046efcbf1dae1a5648aa5a5;hp=d34ad4969a28eb2329d62aa5165256b721b2873d;hpb=f73ad454a80172a451b679a7ba60f87a47d73e71;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index d34ad4969a2..1acf4b07b96 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -19,10 +19,9 @@ /// /// Implementation of AliReconstructor for MUON subsystem. /// -/// The clustering mode and the associated parameters can be changed by using -/// AliMUONRecoParam *muonRecoParam = AliMUONRecoParam::GetLow(High)FluxParam(); -/// muonRecoParam->Set...(); // see methods in AliMUONRecoParam.h for details -/// AliRecoParam::Instance()->RegisterRecoParam(muonRecoParam); +/// The clustering mode and the associated parameters can be changed through the +/// AliMUONRecoParam object set in the reconstruction macro or read from the CDB +/// (see methods in AliMUONRecoParam.h file for details) /// /// Valid modes are : /// @@ -69,14 +68,7 @@ /// /// TRIGGERDISABLE : disable the treatment of MUON trigger /// -/// NOFASTTRKDECODER : makes the digit maker class use the non-high performance decoder -/// AliMUONPayloadTracker instead of AliMUONTrackerDDLDecoder. -/// -/// NOFASTTRGDECODER : makes the digit maker class use the non-high performance decoder -/// AliMUONPayloadTrigger instead of AliMUONTriggerDDLDecoder. -/// -/// NOFASTDECODERS : makes the digit maker class use the non-high performance decoders -/// AliMUONPayloadTracker and AliMUONPayloadTrigger. +/// ENABLEERRORLOGGING : enable error logging (this activates also warnings in RawStreamTracker) /// /// \author Laurent Aphecetche, Subatech //----------------------------------------------------------------------------- @@ -97,10 +89,10 @@ #include "AliMUONDigitStoreV1.h" #include "AliMUONDigitStoreV2R.h" #include "AliMUONGeometryTransformer.h" +#include "AliMUONPadStatusMaker.h" #include "AliMUONPreClusterFinder.h" #include "AliMUONPreClusterFinderV2.h" #include "AliMUONPreClusterFinderV3.h" -#include "AliMUONRecoParam.h" #include "AliMUONSimpleClusterServer.h" #include "AliMUONTracker.h" #include "AliMUONTriggerCircuit.h" @@ -108,16 +100,19 @@ #include "AliMUONVClusterFinder.h" #include "AliMUONVClusterServer.h" #include "AliMUONVTrackStore.h" +#include "AliMUONTriggerElectronics.h" #include "AliMpArea.h" #include "AliMpCDB.h" #include "AliMpConstants.h" +#include "AliMpDDLStore.h" +#include "AliMpSegmentation.h" -#include "AliRecoParam.h" #include "AliRawReader.h" #include "AliCDBManager.h" #include "AliCodeTimer.h" #include "AliLog.h" +#include "AliRunInfo.h" #include #include @@ -129,8 +124,6 @@ ClassImp(AliMUONReconstructor) /// \endcond -AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction parameters - //_____________________________________________________________________________ AliMUONReconstructor::AliMUONReconstructor() : AliReconstructor(), @@ -143,10 +136,26 @@ fDigitCalibrator(0x0), fClusterServer(0x0), fTriggerStore(0x0), fTrackStore(0x0), -fClusterStore(0x0) +fClusterStore(0x0), +fTriggerProcessor(0x0) { /// normal ctor + AliDebug(1,""); + + // Unload mapping objects + // if they have been loaded from the obsolete OCDB mapping objects + + if ( AliMpDDLStore::Instance(false) ) { + AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/DDLStore"); + delete AliMpDDLStore::Instance(); + } + + if ( AliMpSegmentation::Instance(false) ) { + AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/Mapping"); + delete AliMpSegmentation::Instance(); + } + // Load mapping if ( ! AliMpCDB::LoadDDLStore() ) { AliFatal("Could not access mapping from OCDB !"); @@ -161,44 +170,23 @@ fClusterStore(0x0) AliMUONReconstructor::~AliMUONReconstructor() { /// dtor + + AliDebug(1,""); + delete fDigitMaker; delete fDigitStore; delete fTransformer; delete fTriggerCircuit; - delete fCalibrationData; delete fDigitCalibrator; + delete fCalibrationData; delete fClusterServer; delete fTriggerStore; delete fTrackStore; delete fClusterStore; -} + delete fTriggerProcessor; -//_____________________________________________________________________________ -const AliMUONRecoParam* AliMUONReconstructor::GetRecoParam() -{ - /// get reconstruction parameters - - if (!fgRecoParam) { - - // get reconstruction parameters from AliRecoParam if any - TObjArray *recoParams = AliRecoParam::Instance()->GetRecoParam("MUON"); - - if (recoParams) { - - fgRecoParam = (AliMUONRecoParam*) recoParams->Last(); - - } else { - - // initialize reconstruction parameters if not already done - cout<<"W-AliMUONReconstructor::GetRecoParam: Reconstruction parameters not initialized - Use default one"<RegisterRecoParam(fgRecoParam); - - } - - } - - return fgRecoParam; + delete AliMpSegmentation::Instance(false); + delete AliMpDDLStore::Instance(false); } //_____________________________________________________________________________ @@ -210,8 +198,8 @@ AliMUONReconstructor::Calibrate(AliMUONVDigitStore& digitStore) const { CreateCalibrator(); } - AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName())) - fDigitCalibrator->Calibrate(digitStore); + AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()),0) + fDigitCalibrator->Calibrate(digitStore); } //_____________________________________________________________________________ @@ -222,6 +210,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())) @@ -236,7 +232,7 @@ void AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const { /// convert raw data into a digit tree - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) Bool_t alone = ( TriggerStore() == 0 ); @@ -267,28 +263,18 @@ AliMUONReconstructor::CreateDigitMaker() const /// Create (and create if necessary) the digit maker if (fDigitMaker) return; - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) TString option = GetOption(); - Bool_t enableErrorLogging = kTRUE; - Bool_t useFastTrackerDecoder = kTRUE; - Bool_t useFastTriggerDecoder = kTRUE; - if (option.Contains("NOFASTTRKDECODER")) - { - useFastTrackerDecoder = kFALSE; - } - if (option.Contains("NOFASTTRGDECODER")) - { - useFastTriggerDecoder = kFALSE; - } - if (option.Contains("NOFASTDECODERS")) + + Bool_t enableErrorLogging = kFALSE; + + if (option.Contains("ENABLEERRORLOGGING")) { - useFastTrackerDecoder = kFALSE; - useFastTriggerDecoder = kFALSE; + enableErrorLogging = kTRUE; } - fDigitMaker = new AliMUONDigitMaker( - enableErrorLogging, useFastTrackerDecoder, useFastTriggerDecoder - ); + + fDigitMaker = new AliMUONDigitMaker(enableErrorLogging); option.ToUpper(); if ( option.Contains("SAVEDIGITS" )) { @@ -303,7 +289,7 @@ AliMUONReconstructor::CreateTriggerCircuit() const /// Return (and create if necessary) the trigger circuit object if (fTriggerCircuit) return; - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer); @@ -321,9 +307,10 @@ AliMUONReconstructor::CreateTracker() const AliMUONTracker* tracker(0x0); - if ( ! AliMUONReconstructor::GetRecoParam()->CombineClusterTrackReco() ) + if ( ! GetRecoParam()->CombineClusterTrackReco() ) { - tracker = new AliMUONTracker(0x0, + tracker = new AliMUONTracker(GetRecoParam(), + 0x0, *DigitStore(), fDigitMaker, fTransformer, @@ -331,7 +318,8 @@ AliMUONReconstructor::CreateTracker() const } else { - tracker = new AliMUONTracker(fClusterServer, + tracker = new AliMUONTracker(GetRecoParam(), + fClusterServer, *DigitStore(), fDigitMaker, fTransformer, @@ -348,7 +336,7 @@ AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) { /// Create a given cluster finder instance - AliCodeTimerAutoGeneral("") + AliCodeTimerAutoGeneral("",0) AliMUONVClusterFinder* clusterFinder(0x0); @@ -420,7 +408,7 @@ AliMUONReconstructor::CreateClusterServer() const if ( fClusterServer ) return; - AliCodeTimerAuto(""); + AliCodeTimerAuto("",0); AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode()); @@ -433,16 +421,14 @@ AliMUONReconstructor::CreateClusterServer() const //_____________________________________________________________________________ void -AliMUONReconstructor::CreateCalibrator() const +AliMUONReconstructor::CreateCalibrationData() const { /// Create the calibrator - AliCodeTimerAuto("") + AliCodeTimerAuto("",0); Int_t runNumber = AliCDBManager::Instance()->GetRun(); - AliInfo("Calibration will occur."); - fCalibrationData = new AliMUONCalibrationData(runNumber); if ( !fCalibrationData->IsValid() ) { @@ -452,14 +438,67 @@ AliMUONReconstructor::CreateCalibrator() const return; } - // Check that we get all the calibrations we'll need - if ( !fCalibrationData->Pedestals() || - !fCalibrationData->Gains() || - !fCalibrationData->HV() ) + // It is now time to check whether we have everything to proceed. + // What we need depends on whether both tracker and trigger + // are in the readout chain, and what specific "bad channel policy" + // we use + + Bool_t kTracker(kFALSE); + Bool_t kTrigger(kFALSE); + + const AliRunInfo* runInfo = GetRunInfo(); + if (!runInfo) { - AliFatal("Could not access all required calibration data"); + AliError("Could not get runinfo ?") } + else + { + TString detectors(runInfo->GetActiveDetectors()); + if (detectors.Contains("MUONTRK")) kTracker=kTRUE; + if (detectors.Contains("MUONTRG")) kTrigger=kTRUE; + } + + AliInfo(Form("Run with MUON TRIGGER : %s and MUON TRACKER : %s", + kTrigger ? "YES":"NO" , + kTracker ? "YES":"NO")); + if ( kTracker ) + { + // Check that we get all the calibrations we'll need + if ( !fCalibrationData->Pedestals() || + !fCalibrationData->Gains() ) + { + AliFatal(Form("Could not access all required calibration data (PED %p GAIN %p)", + fCalibrationData->Pedestals(),fCalibrationData->Gains())); + } + + if ( !fCalibrationData->HV() ) + { + // Special treatment of HV. We only break if the values + // are not there *AND* we cut on them. + UInt_t mask = GetRecoParam()->PadGoodnessMask(); + TString smask(AliMUONPadStatusMaker::AsCondition(mask)); + if ( smask.Contains("HV") ) + { + AliFatal("Could not access all required calibration data (HV)"); + } + } + } +} + +//_____________________________________________________________________________ +void +AliMUONReconstructor::CreateCalibrator() const +{ + /// Create the calibrator + + AliCodeTimerAuto("",0); + + if ( ! fCalibrationData ) + CreateCalibrationData(); + + AliInfo("Calibration will occur."); + TString opt(GetOption()); opt.ToUpper(); @@ -470,7 +509,24 @@ AliMUONReconstructor::CreateCalibrator() const TString calibMode = GetRecoParam()->GetCalibrationMode(); - fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,calibMode.Data()); + fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data()); +} + +//_____________________________________________________________________________ +void +AliMUONReconstructor::ResponseRemovingChambers(AliMUONVTriggerStore* triggerStore) const +{ + /// Update trigger information with informatins obtained after + /// re-calculation of trigger response + AliCodeTimerAuto("",0); + + if ( ! fCalibrationData ) + CreateCalibrationData(); + + if ( ! fTriggerProcessor ) + fTriggerProcessor = new AliMUONTriggerElectronics(fCalibrationData); + + fTriggerProcessor->ResponseRemovingChambers(*triggerStore); } //_____________________________________________________________________________ @@ -512,20 +568,21 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, { /// Write the trigger and cluster information into TreeR - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) AliDebug(1,""); Bool_t ok(kFALSE); Bool_t alone(kTRUE); // is trigger the only info in TreeR ? - if ( ! AliMUONReconstructor::GetRecoParam()->CombineClusterTrackReco() ) + if ( ! GetRecoParam()->CombineClusterTrackReco() ) { alone = kFALSE; // we'll get both tracker and trigger information in TreeR } if ( triggerStore ) { + ResponseRemovingChambers(triggerStore); ok = triggerStore->Connect(clustersTree,alone); if (!ok) { @@ -543,7 +600,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, CreateClusterServer(); TIter next(DigitStore()->CreateIterator()); - fClusterServer->UseDigits(next); + fClusterServer->UseDigits(next,DigitStore()); AliMpArea area; @@ -551,11 +608,12 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, for ( Int_t i = 0; i < AliMpConstants::NofTrackingChambers(); ++i ) { - if (AliMUONReconstructor::GetRecoParam()->UseChamber(i)) + if (GetRecoParam()->UseChamber(i)) { - if ( i >= 6 && AliMUONReconstructor::GetRecoParam()->BypassSt45() ) continue; + if ( ( i == 6 || i == 7 ) && GetRecoParam()->BypassSt4() ) continue; + if ( ( i == 8 || i == 9 ) && GetRecoParam()->BypassSt5() ) continue; - fClusterServer->Clusterize(i,*fClusterStore,area); + fClusterServer->Clusterize(i,*fClusterStore,area,GetRecoParam()); } } @@ -620,7 +678,7 @@ AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const /// This method is called by AliReconstruction if HasLocalReconstruction()==kTRUE /// AND HasDigitConversion()==kTRUE - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) AliDebug(1,"");