X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONReconstructor.cxx;h=13084e40b76c2cb18cccdee95fb3e008d0b094ea;hb=4ed6fb1c15cc6f3609f2a9c3fcc61d6496c163d2;hp=1b32c1833bcb81cdbf4338c4bd3fd76f42caf38a;hpb=3304fa09cf69d8b335181a6fcffb65a25bc44cee;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index 1b32c1833bc..13084e40b76 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -19,20 +19,19 @@ /// /// 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 by using +/// AliMUONRecoParam *muonRecoParam = AliMUONRecoParam::GetLow(High)FluxParam(); +/// muonRecoParam->Set...(); // see methods in AliMUONRecoParam.h for details +/// AliRecoParam::Instance()->RegisterRecoParam(muonRecoParam); /// -/// 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 /// -/// MLEM : another implementation of AZ, where preclustering is external (default) -/// MLEMV3 : MLEM with preclustering=PRECLUSTERV2 +/// 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 @@ -45,29 +44,45 @@ /// 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 /// +/// ------ +/// +/// 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 /// -/// DIGITSTOREV1 : use the V1 implementation of the digitstore -/// DIGITSTOREV2R : use the V2R implementation of the digitstore +/// USEFASTDECODER : makes the digit maker class use the high performance decoder +/// AliMUONTrackerDDLDecoder instead of AliMUONPayloadTracker. /// /// \author Laurent Aphecetche, Subatech //----------------------------------------------------------------------------- #include "AliMUONReconstructor.h" -#include "AliCDBManager.h" -#include "AliLog.h" #include "AliMUONCalibrationData.h" #include "AliMUONClusterFinderCOG.h" #include "AliMUONClusterFinderMLEM.h" #include "AliMUONClusterFinderSimpleFit.h" -#include "AliMUONClusterReconstructor.h" -#include "AliMUONClusterStoreV2.h" +#include "AliMUONClusterFinderPeakCOG.h" +#include "AliMUONClusterFinderPeakFit.h" #include "AliMUONConstants.h" #include "AliMUONDigitCalibrator.h" #include "AliMUONDigitMaker.h" @@ -77,18 +92,28 @@ #include "AliMUONPreClusterFinder.h" #include "AliMUONPreClusterFinderV2.h" #include "AliMUONPreClusterFinderV3.h" +#include "AliMUONRecoParam.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 "AliMUONRecoParam.h" +#include "AliMUONVClusterServer.h" +#include "AliMUONVTrackStore.h" + +#include "AliMpArea.h" #include "AliMpCDB.h" +#include "AliMpConstants.h" + +#include "AliRecoParam.h" #include "AliRawReader.h" +#include "AliCDBManager.h" #include "AliCodeTimer.h" +#include "AliLog.h" + #include +#include #include #include #include @@ -109,11 +134,9 @@ fDigitStore(0x0), fTriggerCircuit(0x0), fCalibrationData(0x0), fDigitCalibrator(0x0), -fClusterReconstructor(0x0), -fClusterStore(0x0), +fClusterServer(0x0), fTriggerStore(0x0), -fTrackStore(0x0), -fTrigChamberEff(0x0) +fTrackStore(0x0) { /// normal ctor @@ -125,12 +148,6 @@ fTrigChamberEff(0x0) // Load geometry data fTransformer->LoadGeometryData(); - // initialize reconstruction parameters in not already done - if (!fgRecoParam) { - AliWarning("Reconstruction parameters not initialized - Use default one"); - fgRecoParam = AliMUONRecoParam::GetLowFluxParam(); - } - } //_____________________________________________________________________________ @@ -144,25 +161,37 @@ AliMUONReconstructor::~AliMUONReconstructor() delete fTriggerCircuit; delete fCalibrationData; delete fDigitCalibrator; - delete fClusterReconstructor; - delete fClusterStore; + delete fClusterServer; delete fTriggerStore; delete fTrackStore; - delete fTrigChamberEff; } //_____________________________________________________________________________ -void AliMUONReconstructor::SetRecoParam(AliMUONRecoParam *param) +const AliMUONRecoParam* AliMUONReconstructor::GetRecoParam() { - /// set reconstruction parameters + /// get reconstruction parameters - // remove existing parameters - if (fgRecoParam) { - cout<<"AliMUONReconstructor::SetRecoParam: Reconstruction parameters already initialized - overwrite them"<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); + + } + } - fgRecoParam = param; + return fgRecoParam; } //_____________________________________________________________________________ @@ -178,39 +207,6 @@ AliMUONReconstructor::Calibrate(AliMUONVDigitStore& digitStore) const fDigitCalibrator->Calibrate(digitStore); } -//_____________________________________________________________________________ -void -AliMUONReconstructor::Clusterize(const AliMUONVDigitStore& digitStore, - AliMUONVClusterStore& clusterStore) const -{ - /// Creates clusters from digits. - - TString sopt(fgRecoParam->GetClusteringMode()); - sopt.ToUpper(); - if ( sopt.Contains("NOCLUSTERING") ) return; - - if (!fClusterReconstructor) CreateClusterReconstructor(); - - // if the required clustering mode does not exist - if (!fClusterReconstructor) return; - - AliCodeTimerAuto(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) - { - fClusterStore = new AliMUONClusterStoreV2; - } - return fClusterStore; -} - //_____________________________________________________________________________ void AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, @@ -277,7 +273,14 @@ AliMUONReconstructor::CreateDigitMaker() const AliCodeTimerAuto("") - fDigitMaker = new AliMUONDigitMaker; + TString option = GetOption(); + Bool_t enableErrorLogging = kTRUE; + Bool_t useFastDecoder = kFALSE; + if (option.Contains("USEFASTDECODER")) + { + useFastDecoder = kTRUE; + } + fDigitMaker = new AliMUONDigitMaker(enableErrorLogging, useFastDecoder); } //_____________________________________________________________________________ @@ -293,19 +296,6 @@ AliMUONReconstructor::CreateTriggerCircuit() const } -//_____________________________________________________________________________ -void -AliMUONReconstructor::CreateTriggerChamberEff() const -{ - /// Create (and create if necessary) the trigger chamber efficiency class - if (fTrigChamberEff) return; - - AliCodeTimerAuto("") - - fTrigChamberEff = new AliMUONTriggerChamberEff(fTransformer,fDigitMaker,kTRUE); - //fTrigChamberEff->SetDebugLevel(1); -} - //_____________________________________________________________________________ AliTracker* AliMUONReconstructor::CreateTracker() const @@ -314,26 +304,34 @@ AliMUONReconstructor::CreateTracker() const CreateTriggerCircuit(); CreateDigitMaker(); - CreateTriggerChamberEff(); + CreateClusterServer(); + + if (!fClusterServer) + { + AliError("ClusterServer is NULL ! Cannot create tracker"); + return 0x0; + } - AliMUONTracker* tracker = new AliMUONTracker(fDigitMaker,fTransformer,fTriggerCircuit,fTrigChamberEff); + AliMUONTracker* tracker = new AliMUONTracker(*fClusterServer, + *DigitStore(), + fDigitMaker, + fTransformer, + fTriggerCircuit); return tracker; } //_____________________________________________________________________________ -void -AliMUONReconstructor::CreateClusterReconstructor() const +AliMUONVClusterFinder* +AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) const { - /// Create cluster reconstructor, depending on clustering mode set in RecoParam + /// Create a given cluster finder instance AliCodeTimerAuto("") - AliDebug(1,""); - AliMUONVClusterFinder* clusterFinder(0x0); - TString opt(fgRecoParam->GetClusteringMode()); + TString opt(clusterFinderType); opt.ToUpper(); if ( strstr(opt,"PRECLUSTERV2") ) @@ -348,6 +346,14 @@ AliMUONReconstructor::CreateClusterReconstructor() 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); @@ -379,12 +385,31 @@ AliMUONReconstructor::CreateClusterReconstructor() const else { AliError(Form("clustering mode \"%s\" does not exist",opt.Data())); - return; + return 0x0; } + return clusterFinder; +} + +//_____________________________________________________________________________ +void +AliMUONReconstructor::CreateClusterServer() const +{ + /// Create cluster server + + if ( fClusterServer ) return; + + AliCodeTimerAuto("") + + AliDebug(1,""); + + AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode()); + + if ( !clusterFinder ) return; + AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName())); - fClusterReconstructor = new AliMUONClusterReconstructor(clusterFinder,fTransformer); + fClusterServer = new AliMUONSimpleClusterServer(*clusterFinder,*fTransformer); } //_____________________________________________________________________________ @@ -418,7 +443,6 @@ AliMUONReconstructor::CreateCalibrator() const TString opt(GetOption()); opt.ToUpper(); - Bool_t statusMap(kTRUE); if ( strstr(opt,"NOSTATUSMAP") ) { @@ -463,7 +487,6 @@ AliMUONReconstructor::DigitStore() const //_____________________________________________________________________________ void AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, - AliMUONVClusterStore* clusterStore, TTree& clustersTree) const { /// Write the trigger and cluster information into TreeR @@ -475,24 +498,13 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, Bool_t ok(kFALSE); if ( triggerStore ) { - Bool_t alone = ( clusterStore ? kFALSE : kTRUE ); - ok = triggerStore->Connect(clustersTree,alone); + ok = triggerStore->Connect(clustersTree,kTRUE); if (!ok) { AliError("Could not create triggerStore branches in TreeR"); } } - if ( clusterStore ) - { - Bool_t alone = ( triggerStore ? kFALSE : kTRUE ); - ok = clusterStore->Connect(clustersTree,alone); - if (!ok) - { - AliError("Could not create triggerStore branches in TreeR"); - } - } - if (ok) // at least one type of branches created successfully { clustersTree.Fill(); @@ -532,9 +544,8 @@ AliMUONReconstructor::Reconstruct(AliRawReader* rawReader, TTree* clustersTree) } ConvertDigits(rawReader,DigitStore(),TriggerStore()); - Clusterize(*(DigitStore()),*(ClusterStore())); - - FillTreeR(TriggerStore(),ClusterStore(),*clustersTree); + + FillTreeR(TriggerStore(),*clustersTree); } //_____________________________________________________________________________ @@ -622,10 +633,9 @@ AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const { Calibrate(*fDigitStore); } - Clusterize(*fDigitStore,*(ClusterStore())); } - FillTreeR(fTriggerStore,ClusterStore(),*clustersTree); + FillTreeR(fTriggerStore,*clustersTree); } //_____________________________________________________________________________