X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONReconstructor.cxx;h=0948e4fe1e3ad04b0db173073be7ede215b2a5d8;hb=dca193e62097e0fc043da9f51e4b5aa81ce01202;hp=691613603671418468e20c32a4c85e1887327ab7;hpb=15d30ed49c0118c7b2efe3f68ab04ab2e5d148a1;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index 69161360367..0948e4fe1e3 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -44,6 +44,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,6 +69,15 @@ /// /// 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. +/// /// \author Laurent Aphecetche, Subatech //----------------------------------------------------------------------------- @@ -75,6 +87,10 @@ #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" @@ -87,9 +103,7 @@ #include "AliMUONRecoParam.h" #include "AliMUONSimpleClusterServer.h" #include "AliMUONTracker.h" -#include "AliMUONTriggerChamberEff.h" #include "AliMUONTriggerCircuit.h" -#include "AliMUONTriggerCrateStore.h" #include "AliMUONTriggerStoreV1.h" #include "AliMUONVClusterFinder.h" #include "AliMUONVClusterServer.h" @@ -120,7 +134,6 @@ AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction par //_____________________________________________________________________________ AliMUONReconstructor::AliMUONReconstructor() : AliReconstructor(), -fCrateManager(0x0), fDigitMaker(0x0), fTransformer(new AliMUONGeometryTransformer()), fDigitStore(0x0), @@ -130,7 +143,7 @@ fDigitCalibrator(0x0), fClusterServer(0x0), fTriggerStore(0x0), fTrackStore(0x0), -fTrigChamberEff(0x0) +fClusterStore(0x0) { /// normal ctor @@ -151,14 +164,13 @@ AliMUONReconstructor::~AliMUONReconstructor() delete fDigitMaker; delete fDigitStore; delete fTransformer; - delete fCrateManager; delete fTriggerCircuit; delete fCalibrationData; delete fDigitCalibrator; delete fClusterServer; delete fTriggerStore; delete fTrackStore; - delete fTrigChamberEff; + delete fClusterStore; } //_____________________________________________________________________________ @@ -166,24 +178,10 @@ const AliMUONRecoParam* AliMUONReconstructor::GetRecoParam() { /// get reconstruction parameters + // initialize reconstruction parameters if not already done 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); - - } - + cout<<"W-AliMUONReconstructor::GetRecoParam: Reconstruction parameters not initialized - Use default one"<ReadFromFile(); - return fCrateManager; -} - //_____________________________________________________________________________ void AliMUONReconstructor::CreateDigitMaker() const @@ -268,7 +255,31 @@ AliMUONReconstructor::CreateDigitMaker() const AliCodeTimerAuto("") - fDigitMaker = new AliMUONDigitMaker; + 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")) + { + useFastTrackerDecoder = kFALSE; + useFastTriggerDecoder = kFALSE; + } + fDigitMaker = new AliMUONDigitMaker( + enableErrorLogging, useFastTrackerDecoder, useFastTriggerDecoder + ); + option.ToUpper(); + if ( option.Contains("SAVEDIGITS" )) + { + fDigitMaker->SetMakeTriggerDigits(kTRUE); + } } //_____________________________________________________________________________ @@ -284,19 +295,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 @@ -305,33 +303,38 @@ AliMUONReconstructor::CreateTracker() const CreateTriggerCircuit(); CreateDigitMaker(); - CreateTriggerChamberEff(); CreateClusterServer(); + + AliMUONTracker* tracker(0x0); - if (!fClusterServer) + if ( ! AliMUONReconstructor::GetRecoParam()->CombineClusterTrackReco() ) { - AliError("ClusterServer is NULL ! Cannot create tracker"); - return 0x0; + tracker = new AliMUONTracker(0x0, + *DigitStore(), + fDigitMaker, + fTransformer, + fTriggerCircuit); + } + else + { + tracker = new AliMUONTracker(fClusterServer, + *DigitStore(), + fDigitMaker, + fTransformer, + fTriggerCircuit); } - fClusterServer->UseDigitStore(*(DigitStore())); - - AliMUONTracker* tracker = new AliMUONTracker(*fClusterServer, - fDigitMaker, - fTransformer, - fTriggerCircuit, - fTrigChamberEff); return tracker; } //_____________________________________________________________________________ AliMUONVClusterFinder* -AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) const +AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType) { /// Create a given cluster finder instance - AliCodeTimerAuto("") + AliCodeTimerAutoGeneral("") AliMUONVClusterFinder* clusterFinder(0x0); @@ -350,6 +353,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); @@ -380,7 +391,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; } @@ -395,17 +406,15 @@ AliMUONReconstructor::CreateClusterServer() const if ( fClusterServer ) return; - AliCodeTimerAuto("") - - AliDebug(1,""); - + AliCodeTimerAuto(""); + AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode()); if ( !clusterFinder ) return; AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName())); - fClusterServer = new AliMUONSimpleClusterServer(*clusterFinder,*fTransformer); + fClusterServer = new AliMUONSimpleClusterServer(clusterFinder,*fTransformer); } //_____________________________________________________________________________ @@ -445,7 +454,9 @@ AliMUONReconstructor::CreateCalibrator() const AliWarning("NOSTATUSMAP is obsolete"); } - fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData); + TString calibMode = GetRecoParam()->GetCalibrationMode(); + + fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data()); } //_____________________________________________________________________________ @@ -492,19 +503,64 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore, AliDebug(1,""); Bool_t ok(kFALSE); + Bool_t alone(kTRUE); // is trigger the only info in TreeR ? + + if ( ! AliMUONReconstructor::GetRecoParam()->CombineClusterTrackReco() ) + { + alone = kFALSE; // we'll get both tracker and trigger information in TreeR + } + if ( triggerStore ) { - ok = triggerStore->Connect(clustersTree,kTRUE); + ok = triggerStore->Connect(clustersTree,alone); if (!ok) { AliError("Could not create triggerStore branches in TreeR"); } } - + + if ( !alone ) + { + if (!fClusterStore) + { + fClusterStore = new AliMUONClusterStoreV2; + } + + CreateClusterServer(); + + TIter next(DigitStore()->CreateIterator()); + fClusterServer->UseDigits(next); + + 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 (AliMUONReconstructor::GetRecoParam()->UseChamber(i)) + { + if ( ( i == 6 || i == 7 ) && AliMUONReconstructor::GetRecoParam()->BypassSt4() ) continue; + if ( ( i == 8 || i == 9 ) && AliMUONReconstructor::GetRecoParam()->BypassSt5() ) continue; + + fClusterServer->Clusterize(i,*fClusterStore,area); + } + } + + 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(); } //_____________________________________________________________________________ @@ -625,7 +681,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); }