X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=MUON%2FAliMUONReconstructor.cxx;h=561c78ad9d767f83dfd4c47ed55ccc4f1b5dc035;hb=7e7619d198263c3c576858fd0050f0cb1eb8cd0a;hp=f47a7558b7e5a52a85f9fb7072a17eb535d78054;hpb=683cb6c5538805954750251a818e556da428b79f;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index f47a7558b7e..561c78ad9d7 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 : /// @@ -44,6 +43,9 @@ /// option either, as center-of-gravity is generally not a good estimate /// of the cluster position... /// +/// PEAKCOG : COG cluster finder around local maxima +/// PEAKFIT : fit around local maxima with up to 3 peaks, COG otherwise +/// /// NOCLUSTERING : bypass completely the clustering stage /// /// ------ @@ -66,8 +68,7 @@ /// /// TRIGGERDISABLE : disable the treatment of MUON trigger /// -/// USEFASTDECODER : makes the digit maker class use the high performance decoder -/// AliMUONTrackerDDLDecoder instead of AliMUONPayloadTracker. +/// ENABLEERRORLOGGING : enable error logging (this activates also warnings in RawStreamTracker) /// /// \author Laurent Aphecetche, Subatech //----------------------------------------------------------------------------- @@ -78,34 +79,41 @@ #include "AliMUONClusterFinderCOG.h" #include "AliMUONClusterFinderMLEM.h" #include "AliMUONClusterFinderSimpleFit.h" +#include "AliMUONClusterFinderPeakCOG.h" +#include "AliMUONClusterFinderPeakFit.h" +#include "AliMUONClusterStoreV1.h" +#include "AliMUONClusterStoreV2.h" #include "AliMUONConstants.h" #include "AliMUONDigitCalibrator.h" #include "AliMUONDigitMaker.h" #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" -#include "AliMUONTriggerCrateStore.h" #include "AliMUONTriggerStoreV1.h" #include "AliMUONVClusterFinder.h" #include "AliMUONVClusterServer.h" #include "AliMUONVTrackStore.h" +#include "AliMUONTriggerElectronics.h" +#include "AliMUONTriggerUtilities.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 @@ -117,24 +125,40 @@ ClassImp(AliMUONReconstructor) /// \endcond -AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction parameters - //_____________________________________________________________________________ AliMUONReconstructor::AliMUONReconstructor() : AliReconstructor(), -fCrateManager(0x0), fDigitMaker(0x0), fTransformer(new AliMUONGeometryTransformer()), fDigitStore(0x0), fTriggerCircuit(0x0), fCalibrationData(0x0), fDigitCalibrator(0x0), -fClusterServer(0x0), fTriggerStore(0x0), -fTrackStore(0x0) +fTrackStore(0x0), +fClusterStore(0x0), +fTriggerProcessor(0x0), +fTriggerUtilities(0x0), +fClusterServers(), +fTrackers() { /// 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 !"); @@ -142,51 +166,34 @@ fTrackStore(0x0) // Load geometry data fTransformer->LoadGeometryData(); - + + fClusterServers.SetOwner(kTRUE); + fTrackers.SetOwner(kTRUE); } //_____________________________________________________________________________ AliMUONReconstructor::~AliMUONReconstructor() { /// dtor + + AliDebug(1,""); + + delete fDigitCalibrator; + delete fDigitMaker; delete fDigitStore; delete fTransformer; - delete fCrateManager; delete fTriggerCircuit; - delete fCalibrationData; - delete fDigitCalibrator; - delete fClusterServer; delete fTriggerStore; delete fTrackStore; -} + delete fClusterStore; + delete fTriggerProcessor; + delete fTriggerUtilities; -//_____________________________________________________________________________ -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); + + delete fCalibrationData; } //_____________________________________________________________________________ @@ -198,8 +205,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); } //_____________________________________________________________________________ @@ -210,6 +217,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())) @@ -224,7 +239,7 @@ void AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const { /// convert raw data into a digit tree - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) Bool_t alone = ( TriggerStore() == 0 ); @@ -248,17 +263,6 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) } } -//_____________________________________________________________________________ -AliMUONTriggerCrateStore* -AliMUONReconstructor::CrateManager() const -{ - /// Return (and create if necessary) the trigger crate store - if (fCrateManager) return fCrateManager; - fCrateManager = new AliMUONTriggerCrateStore; - fCrateManager->ReadFromFile(); - return fCrateManager; -} - //_____________________________________________________________________________ void AliMUONReconstructor::CreateDigitMaker() const @@ -266,16 +270,32 @@ 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 useFastDecoder = kFALSE; - if (option.Contains("USEFASTDECODER")) + + Bool_t enableErrorLogging = kFALSE; + + if (option.Contains("ENABLEERRORLOGGING")) + { + enableErrorLogging = kTRUE; + } + + fDigitMaker = new AliMUONDigitMaker(enableErrorLogging); + option.ToUpper(); + + // Always make trigger digits + // (needed when calculating trigger chamber efficiency) + fDigitMaker->SetMakeTriggerDigits(kTRUE); + + if ( GetRecoParam()->TryRecover() ) { - useFastDecoder = kTRUE; + fDigitMaker->SetTryRecover(kTRUE); + } + else + { + fDigitMaker->SetTryRecover(kFALSE); } - fDigitMaker = new AliMUONDigitMaker(enableErrorLogging, useFastDecoder); } //_____________________________________________________________________________ @@ -285,12 +305,26 @@ AliMUONReconstructor::CreateTriggerCircuit() const /// Return (and create if necessary) the trigger circuit object if (fTriggerCircuit) return; - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer); } +//_____________________________________________________________________________ +void +AliMUONReconstructor::CreateTriggerUtilities() const +{ + /// Return (and create if necessary) the trigger utilities object + if ( fTriggerUtilities ) return; + + AliCodeTimerAuto("",0) + + if ( ! fCalibrationData ) CreateCalibrationData(); + + fTriggerUtilities = new AliMUONTriggerUtilities(fCalibrationData); +} + //_____________________________________________________________________________ AliTracker* AliMUONReconstructor::CreateTracker() const @@ -298,32 +332,58 @@ AliMUONReconstructor::CreateTracker() const /// Create the MUONTracker object CreateTriggerCircuit(); - CreateDigitMaker(); - CreateClusterServer(); + CreateTriggerUtilities(); + + const AliMUONRecoParam* rp = GetRecoParam(); + + Int_t es = rp->GetEventSpecie(); - if (!fClusterServer) + AliTracker* tracker = static_cast(fTrackers.At(es)); + + if (!tracker ) { - AliError("ClusterServer is NULL ! Cannot create tracker"); - return 0x0; + if ( ! rp->CombineClusterTrackReco() ) + { + tracker = new AliMUONTracker(rp, + 0x0, + *DigitStore(), + fTransformer, + fTriggerCircuit, + fTriggerUtilities); + + AliInfo(Form("Created tracker %p for recoparam of type %s es=%d", + tracker, + AliRecoParam::GetEventSpecieName(AliRecoParam::Convert(rp->GetEventSpecie())),es)); + } + else + { + + tracker = new AliMUONTracker(rp, + CreateClusterServer(*rp), + *DigitStore(), + fTransformer, + fTriggerCircuit, + fTriggerUtilities); + + AliInfo(Form("Created (combined) tracker %p for recoparam of type %s es=%d", + tracker, + AliRecoParam::GetEventSpecieName(AliRecoParam::Convert(rp->GetEventSpecie())),es)); + } + + fTrackers.AddAtAndExpand(tracker,es); } - fClusterServer->UseDigitStore(*(DigitStore())); - - AliMUONTracker* tracker = new AliMUONTracker(*fClusterServer, - fDigitMaker, - fTransformer, - fTriggerCircuit); return tracker; } //_____________________________________________________________________________ AliMUONVClusterFinder* -AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) const +AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) { /// Create a given cluster finder instance - AliCodeTimerAuto("") + AliCodeTimerAutoGeneral("",0) AliMUONVClusterFinder* clusterFinder(0x0); @@ -342,6 +402,14 @@ AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) const { clusterFinder = new AliMUONPreClusterFinder; } + else if ( strstr(opt,"PEAKCOG") ) + { + clusterFinder = new AliMUONClusterFinderPeakCOG(kFALSE,new AliMUONPreClusterFinder); + } + else if ( strstr(opt,"PEAKFIT") ) + { + clusterFinder = new AliMUONClusterFinderPeakFit(kFALSE,new AliMUONPreClusterFinder); + } else if ( strstr(opt,"COG") ) { clusterFinder = new AliMUONClusterFinderCOG(new AliMUONPreClusterFinder); @@ -372,7 +440,7 @@ AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) const } else { - AliError(Form("clustering mode \"%s\" does not exist",opt.Data())); + AliErrorClass(Form("clustering mode \"%s\" does not exist",opt.Data())); return 0x0; } @@ -380,38 +448,42 @@ AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) const } //_____________________________________________________________________________ -void -AliMUONReconstructor::CreateClusterServer() const +AliMUONVClusterServer* +AliMUONReconstructor::CreateClusterServer(const AliMUONRecoParam& rp) const { /// Create cluster server - if ( fClusterServer ) return; + AliCodeTimerAuto("",0); - AliCodeTimerAuto("") - - AliDebug(1,""); - - AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode()); - - if ( !clusterFinder ) return; + AliMUONVClusterServer* clusterServer = static_cast(fClusterServers.At(rp.GetEventSpecie())); - AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName())); + if (!clusterServer ) + { + AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(rp.GetClusteringMode()); + + if ( !clusterFinder ) return 0x0; + + clusterServer = new AliMUONSimpleClusterServer(clusterFinder,*fTransformer); + + AliInfo(Form("Created AliMUONSimpleClusterServer (%p) for specie %d with clustering = %s (following requesting clustering mode %s)", + clusterServer,rp.GetEventSpecie(),clusterFinder->ClassName(),rp.GetClusteringMode())); + + fClusterServers.AddAtAndExpand(clusterServer,rp.GetEventSpecie()); + } - fClusterServer = new AliMUONSimpleClusterServer(*clusterFinder,*fTransformer); + return clusterServer; } //_____________________________________________________________________________ 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() ) { @@ -421,14 +493,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(); @@ -437,7 +562,24 @@ AliMUONReconstructor::CreateCalibrator() const AliWarning("NOSTATUSMAP is obsolete"); } - fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData); + fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam()); +} + +//_____________________________________________________________________________ +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); } //_____________________________________________________________________________ @@ -478,27 +620,81 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, TTree& clustersTree) const { /// Write the trigger and cluster information into TreeR - - AliCodeTimerAuto("") - AliDebug(1,""); - + AliCodeTimerAuto("",0) + Bool_t ok(kFALSE); + Bool_t alone(kTRUE); // is trigger the only info in TreeR ? + + const AliMUONRecoParam* rp = GetRecoParam(); + + if ( ! rp->CombineClusterTrackReco() ) + { + alone = kFALSE; // we'll get both tracker and trigger information in TreeR + } + if ( triggerStore ) { - ok = triggerStore->Connect(clustersTree,kTRUE); + ResponseRemovingChambers(triggerStore); + ok = triggerStore->Connect(clustersTree,alone); if (!ok) { AliError("Could not create triggerStore branches in TreeR"); } } - + + if ( !alone ) + { + if (!fClusterStore) + { + fClusterStore = new AliMUONClusterStoreV2; + } + + AliMUONVClusterServer* clusterServer = CreateClusterServer(*rp); + + TIter next(DigitStore()->CreateIterator()); + clusterServer->UseDigits(next,DigitStore()); + + AliMpArea area; + + AliDebug(1,Form("Doing full clusterization in local reconstruction using %s ",clusterServer->ClassName())); + + for ( Int_t i = 0; i < AliMpConstants::NofTrackingChambers(); ++i ) + { + if (rp->UseChamber(i)) + { + if ( ( i == 6 || i == 7 ) && rp->BypassSt4() ) continue; + if ( ( i == 8 || i == 9 ) && rp->BypassSt5() ) continue; + + clusterServer->Clusterize(i,*fClusterStore,area,rp); + } + } + + Bool_t cok = fClusterStore->Connect(clustersTree,alone); + + if (!cok) AliError("Could not connect clusterStore to clusterTree"); + + AliDebug(1,Form("Number of clusters found = %d",fClusterStore->GetSize())); + + StdoutToAliDebug(1,fClusterStore->Print()); + } + if (ok) // at least one type of branches created successfully { clustersTree.Fill(); } + + if (fClusterStore) fClusterStore->Clear(); } +//_____________________________________________________________________________ +const AliMUONRecoParam* AliMUONReconstructor::GetRecoParam() +{ + /// Get the recoparam from reconstruction + return dynamic_cast(AliReconstructor::GetRecoParam(AliReconstruction::GetDetIndex("MUON"))); +} + + //_____________________________________________________________________________ Bool_t AliMUONReconstructor::HasDigitConversion() const @@ -543,7 +739,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,""); @@ -617,7 +813,7 @@ AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const // i.e. w/o going through raw data, this will be the case) TIter next(fDigitStore->CreateIterator()); AliMUONVDigit* digit = static_cast(next()); - if (!digit->IsCalibrated()) + if (digit && !digit->IsCalibrated()) { Calibrate(*fDigitStore); }