From 5f3519d9041eaa23e2546ee444e4251e773e18ab Mon Sep 17 00:00:00 2001 From: ivana Date: Fri, 16 May 2008 10:14:02 +0000 Subject: [PATCH] Making the high performence raw data decoders default. - The reconstruction options USEFAST*DECODER* were changed to NOFAST*DECODER* - The option is NOT propagated to AliMUONQADataMakerRec, which uses always the default decoder --- MUON/AliMUONDigitMaker.cxx | 10 ++++++---- MUON/AliMUONDigitMaker.h | 2 +- MUON/AliMUONQADataMakerRec.cxx | 4 ++-- MUON/AliMUONReconstructor.cxx | 30 +++++++++++++++--------------- MUON/AlirootRun_MUONtest.sh | 2 +- MUON/Config.C | 6 +++--- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/MUON/AliMUONDigitMaker.cxx b/MUON/AliMUONDigitMaker.cxx index bbb88d0f687..cd36d068d60 100644 --- a/MUON/AliMUONDigitMaker.cxx +++ b/MUON/AliMUONDigitMaker.cxx @@ -126,11 +126,12 @@ void AliMUONDigitMaker::CreateRawStreamTracker(Bool_t useFastDecoder) if (useFastDecoder) { - AliInfo("Using fast tracker decoder."); fRawStreamTracker = new AliMUONRawStreamTrackerHP(); } - else + else { + AliInfo("Using non-high performance tracker decoder."); fRawStreamTracker = new AliMUONRawStreamTracker(); + } } //__________________________________________________________________________ @@ -140,11 +141,12 @@ void AliMUONDigitMaker::CreateRawStreamTrigger(Bool_t useFastDecoder) if (useFastDecoder) { - AliInfo("Using fast trigger decoder."); fRawStreamTrigger = new AliMUONRawStreamTriggerHP(); } - else + else { + AliInfo("Using non-high performance tracker decoder."); fRawStreamTrigger = new AliMUONRawStreamTrigger(); + } } //____________________________________________________________________ diff --git a/MUON/AliMUONDigitMaker.h b/MUON/AliMUONDigitMaker.h index a90c87d4da4..ee40d0feba6 100644 --- a/MUON/AliMUONDigitMaker.h +++ b/MUON/AliMUONDigitMaker.h @@ -31,7 +31,7 @@ class AliMUONDigitMaker : public TObject public: AliMUONDigitMaker( Bool_t enableErrorLogger = kTRUE, - Bool_t useFastTrackerDecoder = kFALSE, Bool_t useFastTriggerDecoder = kFALSE + Bool_t useFastTrackerDecoder = kTRUE, Bool_t useFastTriggerDecoder = kTRUE ); // Constructor virtual ~AliMUONDigitMaker(void); // Destructor diff --git a/MUON/AliMUONQADataMakerRec.cxx b/MUON/AliMUONQADataMakerRec.cxx index f400f2159da..a8220226fb7 100644 --- a/MUON/AliMUONQADataMakerRec.cxx +++ b/MUON/AliMUONQADataMakerRec.cxx @@ -87,7 +87,7 @@ AliMUONQADataMakerRec::AliMUONQADataMakerRec() : { /// ctor fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV1"); - fDigitMaker = new AliMUONDigitMaker(kTRUE,kFALSE); + fDigitMaker = new AliMUONDigitMaker(kTRUE); } //____________________________________________________________________________ @@ -106,7 +106,7 @@ AliMUONQADataMakerRec::AliMUONQADataMakerRec(const AliMUONQADataMakerRec& qadm) // Do not copy the digit store and digit maker, but create its own ones fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV1"); - fDigitMaker = new AliMUONDigitMaker(kTRUE,kFALSE); + fDigitMaker = new AliMUONDigitMaker(kTRUE); } //__________________________________________________________________ diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index b3225cb3a93..5ad4de38e18 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -69,14 +69,14 @@ /// /// TRIGGERDISABLE : disable the treatment of MUON trigger /// -/// USEFASTTRKDECODER : makes the digit maker class use the high performance decoder -/// AliMUONTrackerDDLDecoder instead of AliMUONPayloadTracker. +/// NOFASTTRKDECODER : makes the digit maker class use the non-high performance decoder +/// AliMUONPayloadTracker instead of AliMUONTrackerDDLDecoder. /// -/// USEFASTTRGDECODER : makes the digit maker class use the high performance decoder -/// AliMUONTriggerDDLDecoder instead of AliMUONPayloadTrigger. +/// NOFASTTRGDECODER : makes the digit maker class use the non-high performance decoder +/// AliMUONPayloadTrigger instead of AliMUONTriggerDDLDecoder. /// -/// USEFASTDECODERS : makes the digit maker class use the high performance decoders -/// AliMUONTrackerDDLDecoder and AliMUONTriggerDDLDecoder. +/// NOFASTDECODERS : makes the digit maker class use the non-high performance decoders +/// AliMUONPayloadTracker and AliMUONPayloadTrigger. /// /// \author Laurent Aphecetche, Subatech //----------------------------------------------------------------------------- @@ -283,20 +283,20 @@ AliMUONReconstructor::CreateDigitMaker() const TString option = GetOption(); Bool_t enableErrorLogging = kTRUE; - Bool_t useFastTrackerDecoder = kFALSE; - Bool_t useFastTriggerDecoder = kFALSE; - if (option.Contains("USEFASTTRKDECODER")) + Bool_t useFastTrackerDecoder = kTRUE; + Bool_t useFastTriggerDecoder = kTRUE; + if (option.Contains("NOFASTTRKDECODER")) { - useFastTrackerDecoder = kTRUE; + useFastTrackerDecoder = kFALSE; } - if (option.Contains("USEFASTTRGDECODER")) + if (option.Contains("NOFASTTRGDECODER")) { - useFastTriggerDecoder = kTRUE; + useFastTriggerDecoder = kFALSE; } - if (option.Contains("USEFASTDECODERS")) + if (option.Contains("NOFASTDECODERS")) { - useFastTrackerDecoder = kTRUE; - useFastTriggerDecoder = kTRUE; + useFastTrackerDecoder = kFALSE; + useFastTriggerDecoder = kFALSE; } fDigitMaker = new AliMUONDigitMaker( enableErrorLogging, useFastTrackerDecoder, useFastTriggerDecoder diff --git a/MUON/AlirootRun_MUONtest.sh b/MUON/AlirootRun_MUONtest.sh index ec962046c07..ebb7e7a9ae5 100755 --- a/MUON/AlirootRun_MUONtest.sh +++ b/MUON/AlirootRun_MUONtest.sh @@ -8,7 +8,7 @@ RECONSTRUCTION=1 # will perform reconstruction CHECKS=1 # will perform checks NEVENTS=100 # will simulate 100 events -#RECOPTIONS="SAVEDIGITS USEFASTDECODERS" # reconstruction options with fast decoders +#RECOPTIONS="SAVEDIGITS NOFASTDECODERS" # reconstruction options with non-high performance decoders RECOPTIONS="SAVEDIGITS" # default reconstruction options SIMCONFIG="$ALICE_ROOT/MUON/Config.C" # default simulation configuration file OUTDIR="" diff --git a/MUON/Config.C b/MUON/Config.C index ac062eeb18e..cbf9f4f2cc8 100644 --- a/MUON/Config.C +++ b/MUON/Config.C @@ -210,9 +210,9 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto // Noise-only digits in tracker/trigger (0=no noise, 1=default (noise in tracker), 2=noise in tracker and trigger): //MUON->SetDigitizerWithNoise(kFALSE); - // Use fast raw data decoder - //MUON->SetFastTrackerDecoder(kTRUE); - //MUON->SetFastTriggerDecoder(kTRUE); + // Use non-high performance raw data decoder + //MUON->SetFastTrackerDecoder(kFALSE); + //MUON->SetFastTriggerDecoder(kFALSE); // // If SetAlign, the detection elements transformations -- 2.43.5