X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONReconstructor.cxx;h=729b132d46e748b53c0c089ff2a46add4a9361b1;hb=a9d45f709c2426764a59fd0a6868f8b477134728;hp=421ebcfd6cab785215612ab881a35b78344dd2c3;hpb=a55f49a01992f9b256e43a101357e2575981a0b3;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index 421ebcfd6ca..729b132d46e 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -19,22 +19,18 @@ /// /// 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 : another implementation of AZ, where preclustering is external -/// MLEMV3 : MLEM with preclustering=PRECLUSTERV2 +/// 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 @@ -47,33 +43,46 @@ /// 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 /// -/// DIGITSTOREV1 : use the V1 implementation of the digitstore -/// DIGITSTOREV2R : use the V2R implementation of the digitstore +/// ENABLEERRORLOGGING : enable error logging (this activates also warnings in RawStreamTracker) /// /// \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 "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" @@ -83,21 +92,31 @@ #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 "AliMpArea.h" #include "AliMpCDB.h" +#include "AliMpConstants.h" +#include "AliMpDDLStore.h" +#include "AliMpSegmentation.h" + #include "AliRawReader.h" +#include "AliCDBManager.h" #include "AliCodeTimer.h" +#include "AliLog.h" + #include +#include #include #include #include -//#include "AliCodeTimer.h" + /// \cond CLASSIMP ClassImp(AliMUONReconstructor) /// \endcond @@ -105,21 +124,27 @@ ClassImp(AliMUONReconstructor) //_____________________________________________________________________________ AliMUONReconstructor::AliMUONReconstructor() : AliReconstructor(), -fCrateManager(0x0), fDigitMaker(0x0), fTransformer(new AliMUONGeometryTransformer()), fDigitStore(0x0), fTriggerCircuit(0x0), fCalibrationData(0x0), fDigitCalibrator(0x0), -fClusterReconstructor(0x0), -fClusterStore(0x0), +fClusterServer(0x0), fTriggerStore(0x0), fTrackStore(0x0), -fTrigChamberEff(0x0) +fClusterStore(0x0) { /// normal ctor + AliDebug(1,""); + + // Unload and delete old mapping + AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/Mapping"); + AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/DDLStore"); + delete AliMpDDLStore::Instance(); + delete AliMpSegmentation::Instance(); + // Load mapping if ( ! AliMpCDB::LoadDDLStore() ) { AliFatal("Could not access mapping from OCDB !"); @@ -128,25 +153,28 @@ fTrigChamberEff(0x0) // Load geometry data fTransformer->LoadGeometryData(); - } //_____________________________________________________________________________ AliMUONReconstructor::~AliMUONReconstructor() { /// dtor + + AliDebug(1,""); + delete fDigitMaker; delete fDigitStore; delete fTransformer; - delete fCrateManager; delete fTriggerCircuit; - delete fCalibrationData; delete fDigitCalibrator; - delete fClusterReconstructor; - delete fClusterStore; + delete fCalibrationData; + delete fClusterServer; delete fTriggerStore; delete fTrackStore; - delete fTrigChamberEff; + delete fClusterStore; + + delete AliMpSegmentation::Instance(false); + delete AliMpDDLStore::Instance(false); } //_____________________________________________________________________________ @@ -158,43 +186,10 @@ AliMUONReconstructor::Calibrate(AliMUONVDigitStore& digitStore) const { CreateCalibrator(); } - AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName())) + AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()),0) 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(); - } - - 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 AliMUONClusterStoreV1; - } - return fClusterStore; -} - //_____________________________________________________________________________ void AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, @@ -203,6 +198,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())) @@ -217,6 +220,7 @@ void AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const { /// convert raw data into a digit tree + AliCodeTimerAuto("",0) Bool_t alone = ( TriggerStore() == 0 ); @@ -233,22 +237,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 @@ -256,9 +251,23 @@ AliMUONReconstructor::CreateDigitMaker() const /// Create (and create if necessary) the digit maker if (fDigitMaker) return; - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) - fDigitMaker = new AliMUONDigitMaker; + TString option = GetOption(); + + Bool_t enableErrorLogging = kFALSE; + + if (option.Contains("ENABLEERRORLOGGING")) + { + enableErrorLogging = kTRUE; + } + + fDigitMaker = new AliMUONDigitMaker(enableErrorLogging); + option.ToUpper(); + if ( option.Contains("SAVEDIGITS" )) + { + fDigitMaker->SetMakeTriggerDigits(kTRUE); + } } //_____________________________________________________________________________ @@ -268,55 +277,58 @@ AliMUONReconstructor::CreateTriggerCircuit() const /// Return (and create if necessary) the trigger circuit object if (fTriggerCircuit) return; - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer); } -//_____________________________________________________________________________ -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 { /// Create the MUONTracker object - /// The MUONTracker is passed the GetOption(), i.e. our own options CreateTriggerCircuit(); CreateDigitMaker(); - CreateTriggerChamberEff(); + CreateClusterServer(); + + AliMUONTracker* tracker(0x0); + + if ( ! GetRecoParam()->CombineClusterTrackReco() ) + { + tracker = new AliMUONTracker(GetRecoParam(), + 0x0, + *DigitStore(), + fDigitMaker, + fTransformer, + fTriggerCircuit); + } + else + { + tracker = new AliMUONTracker(GetRecoParam(), + fClusterServer, + *DigitStore(), + fDigitMaker, + fTransformer, + fTriggerCircuit); + } - AliMUONTracker* tracker = new AliMUONTracker(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 - AliCodeTimerAuto("") + AliCodeTimerAutoGeneral("",0) - AliDebug(1,""); - AliMUONVClusterFinder* clusterFinder(0x0); - TString opt(GetOption()); + TString opt(clusterFinderType); opt.ToUpper(); if ( strstr(opt,"PRECLUSTERV2") ) @@ -331,6 +343,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); @@ -359,22 +379,32 @@ AliMUONReconstructor::CreateClusterReconstructor() const { clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinder); } - else if ( strstr(opt,"AZ") ) - { - clusterFinder = new AliMUONClusterFinderAZ; - } else { - // default is currently AZ - clusterFinder = new AliMUONClusterFinderAZ; + AliErrorClass(Form("clustering mode \"%s\" does not exist",opt.Data())); + return 0x0; } - if ( clusterFinder ) - { - AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName())); - } + return clusterFinder; +} + +//_____________________________________________________________________________ +void +AliMUONReconstructor::CreateClusterServer() const +{ + /// Create cluster server - fClusterReconstructor = new AliMUONClusterReconstructor(clusterFinder,fTransformer); + if ( fClusterServer ) return; + + AliCodeTimerAuto("",0); + + AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode()); + + if ( !clusterFinder ) return; + + AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName())); + + fClusterServer = new AliMUONSimpleClusterServer(clusterFinder,*fTransformer); } //_____________________________________________________________________________ @@ -383,7 +413,7 @@ AliMUONReconstructor::CreateCalibrator() const { /// Create the calibrator - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) Int_t runNumber = AliCDBManager::Instance()->GetRun(); @@ -408,14 +438,15 @@ AliMUONReconstructor::CreateCalibrator() const 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"); } - fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,statusMap); + + TString calibMode = GetRecoParam()->GetCalibrationMode(); + + fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data()); } //_____________________________________________________________________________ @@ -453,40 +484,73 @@ AliMUONReconstructor::DigitStore() const //_____________________________________________________________________________ void AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, - AliMUONVClusterStore* clusterStore, TTree& clustersTree) const { /// 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 ( ! GetRecoParam()->CombineClusterTrackReco() ) + { + alone = kFALSE; // we'll get both tracker and trigger information in TreeR + } + if ( triggerStore ) { - Bool_t alone = ( clusterStore ? kFALSE : kTRUE ); 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; + } + + CreateClusterServer(); + + TIter next(DigitStore()->CreateIterator()); + fClusterServer->UseDigits(next,DigitStore()); + + AliMpArea area; + + AliDebug(1,Form("Doing full clusterization in local reconstruction using %s ",fClusterServer->ClassName())); + + for ( Int_t i = 0; i < AliMpConstants::NofTrackingChambers(); ++i ) + { + if (GetRecoParam()->UseChamber(i)) + { + if ( ( i == 6 || i == 7 ) && GetRecoParam()->BypassSt4() ) continue; + if ( ( i == 8 || i == 9 ) && GetRecoParam()->BypassSt5() ) continue; + + fClusterServer->Clusterize(i,*fClusterStore,area,GetRecoParam()); + } + } + + 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(); } //_____________________________________________________________________________ @@ -522,9 +586,8 @@ AliMUONReconstructor::Reconstruct(AliRawReader* rawReader, TTree* clustersTree) } ConvertDigits(rawReader,DigitStore(),TriggerStore()); - Clusterize(*(DigitStore()),*(ClusterStore())); - - FillTreeR(TriggerStore(),ClusterStore(),*clustersTree); + + FillTreeR(TriggerStore(),*clustersTree); } //_____________________________________________________________________________ @@ -534,7 +597,7 @@ AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const /// This method is called by AliReconstruction if HasLocalReconstruction()==kTRUE /// AND HasDigitConversion()==kTRUE -// AliCodeTimerAuto("(TTree*,TTree*)") + AliCodeTimerAuto("",0) AliDebug(1,""); @@ -608,14 +671,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); } //_____________________________________________________________________________