X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONReconstructor.cxx;h=beaf1f5fa9f68ba23af4489748e9e93a276dbc69;hb=c2aad3ae1100f4f7bc489afceea36a03dfce5163;hp=45334d41c721e5abcde28355abdc67fb089e0ef0;hpb=e729a0c885537654d32553b893d95d2e9d57b1af;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index 45334d41c72..beaf1f5fa9f 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -14,74 +14,109 @@ **************************************************************************/ /* $Id$ */ +//----------------------------------------------------------------------------- /// \class AliMUONReconstructor /// /// Implementation of AliReconstructor for MUON subsystem. /// -/// The behavior of the MUON reconstruction can be changed, besides -/// the usual methods found in AliReconstruction (e.g. to disable tracking) -/// by using AliReconstruction::SetOption("MUON",options) -/// where options should be a space separated string. +/// 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 options are : -/// -/// SAVEDIGITS : if you want to save in the TreeD the *calibrated* digits -/// that are used for the clustering +/// Valid modes are : /// /// SIMPLEFIT : use the AliMUONClusterFinderSimpleFit clusterizer /// -/// AZ : use the AliMUONClusterFinderAZ clusterizer (default) +/// SIMPLEFITV3 : SIMPLEFIT with preclustering=PRECLUSTERV3 +/// +/// MLEM : use AliMUONClusterFinderMLEM and AliMUONPreClusterFinder for preclustering (default) +/// MLEMV2 : MLEM with preclustering=PRECLUSTERV2 +/// MLEMV3 : MLEM with preclustering=PRECLUSTERV3 /// /// PRECLUSTER : use only AliMUONPreClusterFinder. Only for debug as /// the produced clusters do not have a position, hence the tracking will not /// work +/// PRECLUSTERV2 : another version of the preclustering +/// PRECLUSTERV3 : yet another version of the preclustering /// /// COG : use AliMUONClusterFinderCOG clusterizer. Not really a production /// 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 /// -/// NOSTATUSMAP : disable the computation and usage of the pad status map. Only -/// for debug ! +/// ------ +/// +/// The behavior of the MUON reconstruction can also be changed, besides +/// the usual methods found in AliReconstruction (e.g. to disable tracking) +/// by using AliReconstruction::SetOption("MUON",options) +/// where options should be a space separated string. +/// +/// Valid options are : +/// +/// SAVEDIGITS : if you want to save in the TreeD the *calibrated* digits +/// that are used for the clustering +/// +/// DIGITSTOREV1 : use the V1 implementation of the digitstore +/// DIGITSTOREV2R : use the V2R implementation of the digitstore /// /// NOLOCALRECONSTRUCTION : for debug, to disable local reconstruction (and hence /// "recover" old behavior) /// /// TRIGGERDISABLE : disable the treatment of MUON trigger /// +/// ENABLEERRORLOGGING : enable error logging (this activates also warnings in RawStreamTracker) +/// /// \author Laurent Aphecetche, Subatech +//----------------------------------------------------------------------------- #include "AliMUONReconstructor.h" -#include "AliCDBManager.h" -#include "AliLoader.h" -#include "AliLog.h" -#include "AliRunLoader.h" #include "AliMUONCalibrationData.h" #include "AliMUONClusterFinderCOG.h" #include "AliMUONClusterFinderMLEM.h" #include "AliMUONClusterFinderSimpleFit.h" -#include "AliMUONClusterFinderAZ.h" -#include "AliMUONClusterReconstructor.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 "AliMUONSimpleClusterServer.h" #include "AliMUONTracker.h" -#include "AliMUONVTrackStore.h" -#include "AliMUONTriggerChamberEff.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 "AliRawReader.h" -#include "AliMUONStopwatchGroup.h" -#include "AliMUONStopwatchGroupElement.h" +#include "AliCDBManager.h" +#include "AliCodeTimer.h" +#include "AliLog.h" +#include "AliRunInfo.h" + #include +#include #include #include #include @@ -93,43 +128,73 @@ ClassImp(AliMUONReconstructor) //_____________________________________________________________________________ AliMUONReconstructor::AliMUONReconstructor() : AliReconstructor(), -fCrateManager(0x0), fDigitMaker(0x0), -fTransformer(new AliMUONGeometryTransformer(kTRUE)), +fTransformer(new AliMUONGeometryTransformer()), fDigitStore(0x0), fTriggerCircuit(0x0), fCalibrationData(0x0), fDigitCalibrator(0x0), -fClusterReconstructor(0x0), -fClusterStore(0x0), fTriggerStore(0x0), fTrackStore(0x0), -fTrigChamberEff(0x0), -fTimers(new AliMUONStopwatchGroup) +fClusterStore(0x0), +fTriggerProcessor(0x0), +fTriggerUtilities(0x0), +fClusterServers(), +fTrackers(), +fShouldCalibrate(kTRUE) { /// normal ctor - fTransformer->ReadGeometryData("volpath.dat", "geometry.root"); + + 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 !"); + } + + // 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 fClusterReconstructor; - delete fClusterStore; delete fTriggerStore; delete fTrackStore; - delete fTrigChamberEff; - AliInfo("Timers:"); - fTimers->Print(); - delete fTimers; + delete fClusterStore; + delete fTriggerProcessor; + delete fTriggerUtilities; + + delete AliMpSegmentation::Instance(false); + delete AliMpDDLStore::Instance(false); + + delete fCalibrationData; } //_____________________________________________________________________________ @@ -141,41 +206,12 @@ AliMUONReconstructor::Calibrate(AliMUONVDigitStore& digitStore) const { CreateCalibrator(); } - AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName())); - fDigitCalibrator->Calibrate(digitStore); -} - -//_____________________________________________________________________________ -void -AliMUONReconstructor::Clusterize(const AliMUONVDigitStore& digitStore, - AliMUONVClusterStore& clusterStore) const -{ - /// Creates clusters from digits. - - TString sopt(GetOption()); - sopt.ToUpper(); - if ( sopt.Contains("NOCLUSTERING") ) return; - - if (!fClusterReconstructor) - { - CreateClusterReconstructor(); - } - - AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Digits2Clusters(const AliMUONVDigitStore&,AliMUONVClusterStore&)", - fClusterReconstructor->ClassName())); - fClusterReconstructor->Digits2Clusters(digitStore,clusterStore); -} - -//_____________________________________________________________________________ -AliMUONVClusterStore* -AliMUONReconstructor::ClusterStore() const -{ - /// Return (and create if necessary) the cluster container - if (!fClusterStore) + + if ( fShouldCalibrate ) { - fClusterStore = new AliMUONClusterStoreV1; + AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()),0) + fDigitCalibrator->Calibrate(digitStore); } - return fClusterStore; } //_____________________________________________________________________________ @@ -186,9 +222,20 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, { /// Convert raw data into digit and trigger stores CreateDigitMaker(); - AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)", - fDigitMaker->ClassName())); + + // 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())) fDigitMaker->Raw2Digits(rawReader,digitStore,triggerStore); + AliCodeTimerStop(Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)", + fDigitMaker->ClassName())) Calibrate(*digitStore); } @@ -197,6 +244,7 @@ void AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const { /// convert raw data into a digit tree + AliCodeTimerAuto("",0) Bool_t alone = ( TriggerStore() == 0 ); @@ -213,22 +261,13 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) else { ConvertDigits(rawReader,DigitStore(),TriggerStore()); + AliCodeTimerStart("Fill digits") digitsTree->Fill(); + AliCodeTimerStop("Fill digits") DigitStore()->Clear(); } } -//_____________________________________________________________________________ -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 @@ -236,9 +275,32 @@ AliMUONReconstructor::CreateDigitMaker() const /// Create (and create if necessary) the digit maker if (fDigitMaker) return; - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateDigitMaker()"); + AliCodeTimerAuto("",0) + + TString option = GetOption(); + + 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); - fDigitMaker = new AliMUONDigitMaker; + if ( GetRecoParam()->TryRecover() ) + { + fDigitMaker->SetTryRecover(kTRUE); + } + else + { + fDigitMaker->SetTryRecover(kFALSE); + } } //_____________________________________________________________________________ @@ -248,112 +310,185 @@ AliMUONReconstructor::CreateTriggerCircuit() const /// Return (and create if necessary) the trigger circuit object if (fTriggerCircuit) return; - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateTriggerCircuit()"); + AliCodeTimerAuto("",0) fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer); } //_____________________________________________________________________________ -void -AliMUONReconstructor::CreateTriggerChamberEff() const +void +AliMUONReconstructor::CreateTriggerUtilities() const { - /// Create (and create if necessary) the trigger chamber efficiency class - if (fTrigChamberEff) return; - - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateTriggerChamberEff()"); - - fTrigChamberEff = new AliMUONTriggerChamberEff(fTransformer,fDigitMaker,kTRUE); - //fTrigChamberEff->SetDebugLevel(1); + /// Return (and create if necessary) the trigger utilities object + if ( fTriggerUtilities ) return; + + AliCodeTimerAuto("",0) + + if ( ! fCalibrationData ) CreateCalibrationData(); + + fTriggerUtilities = new AliMUONTriggerUtilities(fCalibrationData); } //_____________________________________________________________________________ AliTracker* -AliMUONReconstructor::CreateTracker(AliRunLoader* runLoader) const +AliMUONReconstructor::CreateTracker() const { /// Create the MUONTracker object - /// The MUONTracker is passed the GetOption(), i.e. our own options CreateTriggerCircuit(); - CreateDigitMaker(); - CreateTriggerChamberEff(); + CreateTriggerUtilities(); + + const AliMUONRecoParam* rp = GetRecoParam(); + + Int_t es = rp->GetEventSpecie(); - AliLoader* loader = runLoader->GetDetectorLoader("MUON"); - if (!loader) + AliTracker* tracker = static_cast(fTrackers.At(es)); + + if (!tracker ) { - AliError("Cannot get MUONLoader, so cannot create MUONTracker"); - 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); } - AliMUONTracker* tracker = new AliMUONTracker(loader,fDigitMaker,fTransformer,fTriggerCircuit,fTrigChamberEff); - tracker->SetOption(GetOption()); + return tracker; } //_____________________________________________________________________________ -void -AliMUONReconstructor::CreateClusterReconstructor() const +AliMUONVClusterFinder* +AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) { - /// Create cluster reconstructor, depending on GetOption() + /// Create a given cluster finder instance - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateClusterReconstructor()"); + AliCodeTimerAutoGeneral("",0) - AliDebug(1,""); - AliMUONVClusterFinder* clusterFinder(0x0); - TString opt(GetOption()); + TString opt(clusterFinderType); opt.ToUpper(); - if ( strstr(opt,"PRECLUSTER") ) + if ( strstr(opt,"PRECLUSTERV2") ) + { + clusterFinder = new AliMUONPreClusterFinderV2; + } + else if ( strstr(opt,"PRECLUSTERV3") ) + { + clusterFinder = new AliMUONPreClusterFinderV3; + } + else if ( strstr(opt,"PRECLUSTER") ) { 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; + clusterFinder = new AliMUONClusterFinderCOG(new AliMUONPreClusterFinder); } + else if ( strstr(opt,"SIMPLEFITV3") ) + { + clusterFinder = new AliMUONClusterFinderSimpleFit(new AliMUONClusterFinderCOG(new AliMUONPreClusterFinderV3)); + } else if ( strstr(opt,"SIMPLEFIT") ) { - clusterFinder = new AliMUONClusterFinderSimpleFit; + clusterFinder = new AliMUONClusterFinderSimpleFit(new AliMUONClusterFinderCOG(new AliMUONPreClusterFinder)); } else if ( strstr(opt,"MLEM:DRAW") ) { - clusterFinder = new AliMUONClusterFinderMLEM(kTRUE); + clusterFinder = new AliMUONClusterFinderMLEM(kTRUE,new AliMUONPreClusterFinder); } - else if ( strstr(opt,"MLEM") ) + else if ( strstr(opt,"MLEMV3") ) { - clusterFinder = new AliMUONClusterFinderMLEM(kFALSE); + clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinderV3); } - else if ( strstr(opt,"AZ") ) + else if ( strstr(opt,"MLEMV2") ) { - clusterFinder = new AliMUONClusterFinderAZ; - } + clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinderV2); + } + else if ( strstr(opt,"MLEM") ) + { + clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinder); + } else { - clusterFinder = new AliMUONClusterFinderAZ; + AliErrorClass(Form("clustering mode \"%s\" does not exist",opt.Data())); + return 0x0; } - if ( clusterFinder ) + return clusterFinder; +} + +//_____________________________________________________________________________ +AliMUONVClusterServer* +AliMUONReconstructor::CreateClusterServer(const AliMUONRecoParam& rp) const +{ + /// Create cluster server + + AliCodeTimerAuto("",0); + + AliMUONVClusterServer* clusterServer = static_cast(fClusterServers.At(rp.GetEventSpecie())); + + if (!clusterServer ) { - AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName())); + 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()); } - fClusterReconstructor = new AliMUONClusterReconstructor(clusterFinder,fTransformer); + return clusterServer; } //_____________________________________________________________________________ void -AliMUONReconstructor::CreateCalibrator() const +AliMUONReconstructor::CreateCalibrationData() const { /// Create the calibrator - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateCalibrator()"); + AliCodeTimerAuto("",0); Int_t runNumber = AliCDBManager::Instance()->GetRun(); - AliInfo("Calibration will occur."); - fCalibrationData = new AliMUONCalibrationData(runNumber); if ( !fCalibrationData->IsValid() ) { @@ -363,24 +498,114 @@ 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(); - Bool_t statusMap(kTRUE); if ( strstr(opt,"NOSTATUSMAP") ) { - AliWarning("Disconnecting status map : SHOULD BE USED FOR DEBUG ONLY. NOT FOR PRODUCTION !!!"); - statusMap = kFALSE; + AliWarning("NOSTATUSMAP is obsolete"); + } + + Bool_t kTracker(kFALSE); + + const AliRunInfo* runInfo = GetRunInfo(); + if (!runInfo) + { + AliError("Could not get runinfo ?"); + } + else + { + TString detectors(runInfo->GetActiveDetectors()); + if (detectors.Contains("MUONTRK")) kTracker=kTRUE; + } + + if ( kTracker ) + { + fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam()); + } + else + { + AliWarning("Apparently running without MCH so will not instantiante the DigitCalibrator nor read MCH OCDB objects..."); + fShouldCalibrate=kFALSE; } - fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,statusMap); +} + +//_____________________________________________________________________________ +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); } //_____________________________________________________________________________ @@ -390,7 +615,27 @@ AliMUONReconstructor::DigitStore() const /// Return (and create if necessary) the digit container if (!fDigitStore) { - fDigitStore = new AliMUONDigitStoreV1; + TString sopt(GetOption()); + sopt.ToUpper(); + + AliInfo(Form("Options=%s",sopt.Data())); + + if ( sopt.Contains("DIGITSTOREV1") ) + { + fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV1"); + } + else if ( sopt.Contains("DIGITSTOREV2R") ) + { + fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV2R"); + } + else if ( sopt.Contains("DIGITSTOREV2S") ) + { + fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV2S"); + } + + if (!fDigitStore) fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV2R"); + + AliInfo(Form("Will use %s to store digits during reconstruction",fDigitStore->ClassName())); } return fDigitStore; } @@ -398,42 +643,84 @@ AliMUONReconstructor::DigitStore() const //_____________________________________________________________________________ void AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, - AliMUONVClusterStore* clusterStore, TTree& clustersTree) const { /// Write the trigger and cluster information into TreeR - - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::FillTreeR()"); - 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 ) { - Bool_t alone = ( clusterStore ? kFALSE : kTRUE ); + ResponseRemovingChambers(triggerStore); ok = triggerStore->Connect(clustersTree,alone); if (!ok) { AliError("Could not create triggerStore branches in TreeR"); } } - - if ( clusterStore ) + + if ( !alone ) { - Bool_t alone = ( triggerStore ? kFALSE : kTRUE ); - ok = clusterStore->Connect(clustersTree,alone); - if (!ok) + if (!fClusterStore) { - AliError("Could not create triggerStore branches in TreeR"); - } + 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 @@ -453,23 +740,6 @@ AliMUONReconstructor::HasDigitConversion() const } } -//_____________________________________________________________________________ -Bool_t -AliMUONReconstructor::HasLocalReconstruction() const -{ - /// Whether or not we have local reconstruction - TString opt(GetOption()); - opt.ToUpper(); - if ( opt.Contains("NOLOCALRECONSTRUCTION" ) ) - { - return kFALSE; - } - else - { - return kTRUE; - } -} - //_____________________________________________________________________________ void AliMUONReconstructor::Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const @@ -483,91 +753,9 @@ AliMUONReconstructor::Reconstruct(AliRawReader* rawReader, TTree* clustersTree) return; } - if ( DigitStore() ) - { - ConvertDigits(rawReader,DigitStore(),TriggerStore()); - Clusterize(*(DigitStore()),*(ClusterStore())); - } - - FillTreeR(TriggerStore(),ClusterStore(),*clustersTree); -} - -//_____________________________________________________________________________ -void -AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const -{ - /// Reconstruct simulated data - - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::Reconstruct(AliRunLoader*)"); - - AliLoader* loader = runLoader->GetDetectorLoader("MUON"); - if (!loader) - { - AliError("Could not get MUON loader"); - return; - } - - Int_t nEvents = runLoader->GetNumberOfEvents(); - - for ( Int_t i = 0; i < nEvents; ++i ) - { - runLoader->GetEvent(i); - - loader->LoadRecPoints("update"); - loader->CleanRecPoints(); - loader->MakeRecPointsContainer(); - TTree* clustersTree = loader->TreeR(); - - loader->LoadDigits("read"); - TTree* digitsTree = loader->TreeD(); + ConvertDigits(rawReader,DigitStore(),TriggerStore()); - Reconstruct(digitsTree,clustersTree); - - loader->UnloadDigits(); - loader->WriteRecPoints("OVERWRITE"); - loader->UnloadRecPoints(); - } -} - -//_____________________________________________________________________________ -void -AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* rawReader) const -{ - /// This method is called by AliReconstruction if HasLocalReconstruction()==kFALSE - - AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::Reconstruct(AliRunLoader*, AliRawReader*)"); - - AliLoader* loader = runLoader->GetDetectorLoader("MUON"); - if (!loader) - { - AliError("Could not get MUON loader"); - return; - } - - Int_t i(0); - - while (rawReader->NextEvent()) - { - runLoader->GetEvent(i++); - - loader->LoadRecPoints("update"); - loader->CleanRecPoints(); - loader->MakeRecPointsContainer(); - TTree* clustersTree = loader->TreeR(); - - loader->LoadDigits("update"); - loader->CleanDigits(); - loader->MakeDigitsContainer(); - TTree* digitsTree = loader->TreeD(); - ConvertDigits(rawReader, digitsTree); - loader->WriteDigits("OVERWRITE"); - - Reconstruct(digitsTree,clustersTree); - - loader->UnloadDigits(); - loader->WriteRecPoints("OVERWRITE"); - loader->UnloadRecPoints(); - } + FillTreeR(TriggerStore(),*clustersTree); } //_____________________________________________________________________________ @@ -577,6 +765,8 @@ AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const /// This method is called by AliReconstruction if HasLocalReconstruction()==kTRUE /// AND HasDigitConversion()==kTRUE + AliCodeTimerAuto("",0) + AliDebug(1,""); if (!digitsTree || !clustersTree) @@ -649,14 +839,13 @@ 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); } - Clusterize(*fDigitStore,*(ClusterStore())); } - FillTreeR(fTriggerStore,ClusterStore(),*clustersTree); + FillTreeR(fTriggerStore,*clustersTree); } //_____________________________________________________________________________