X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUON.cxx;h=3cf30d3cd866acbb6d6484ce3f66925168cb4cbc;hb=8812811557dbb35fa7ffdbeae10c0c2273588b27;hp=f571fd68f849d4dcd21fca4ac2836e78a88ac55e;hpb=44b96781350abcb1a168059962e0b2ef7ddf07ca;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx index f571fd68f84..3cf30d3cd86 100644 --- a/MUON/AliMUON.cxx +++ b/MUON/AliMUON.cxx @@ -15,11 +15,12 @@ /* $Id$ */ -// ------------------ +//----------------------------------------------------------------------------- // Class AliMUON // ------------------ // AliDetector class for MUON subsystem // providing simulation data management +//----------------------------------------------------------------------------- #include "Riostream.h" @@ -48,37 +49,37 @@ //#include "AliHeader.h" #include "AliLoader.h" +#include "AliCDBManager.h" #include "AliRunDigitizer.h" #include "AliMC.h" -#include "AliRun.h" +#include "AliRun.h" +#include "AliRawDataHeaderSim.h" #include "AliMUON.h" #include "AliMUONChamberTrigger.h" #include "AliMUONConstants.h" #include "AliMUONHit.h" -#include "AliMUONRawCluster.h" -#include "AliMUONTransientDigit.h" -#include "AliMUONTriggerCircuit.h" -#include "AliMUONTriggerCircuitNew.h" #include "AliMUONGeometry.h" #include "AliMUONGeometryTransformer.h" #include "AliMUONGeometryBuilder.h" #include "AliMUONCommonGeometryBuilder.h" #include "AliMUONVGeometryBuilder.h" -#include "AliMUONGeometrySegmentation.h" -#include "AliMUONDigitizerv2.h" -#include "AliMUONSDigitizerv1.h" #include "AliMUONRawWriter.h" -#include "AliMUONSegmentation.h" #include "AliLog.h" #include "AliMUONSDigitizerV2.h" #include "AliMUONDigitizerV3.h" +#include "AliMUONDigitMaker.h" +#include "AliMUONCalibrationData.h" #include "AliMUONSt1GeometryBuilderV2.h" #include "AliMUONSt2GeometryBuilderV2.h" #include "AliMUONSlatGeometryBuilder.h" #include "AliMUONTriggerGeometryBuilder.h" +#include "AliMUONDigitStoreV1.h" +#include "AliMUONVTriggerStore.h" +#include "AliMUONHitStoreV1.h" + // Defaults parameters for Z positions of chambers // taken from values for "stations" in AliMUON::AliMUON // const Float_t zch[7]={528, 690., 975., 1249., 1449., 1610, 1710.}; @@ -102,13 +103,9 @@ AliMUON::AliMUON() : AliDetector(), fNCh(0), fNTrackingCh(0), - fMUONData(0), fSplitLevel(0), fChambers(0), - fTriggerCircuits(0), - fTriggerCircuitsNew(0), fGeometryBuilder(0), - fSegmentation(0), fAccCut(kFALSE), fAccMin(0.), fAccMax(0.), @@ -119,9 +116,16 @@ AliMUON::AliMUON() fMaxIterPad(0), fCurIterPad(0), fTriggerScalerEvent(kFALSE), - fSDigitizerType(""), - fDigitizerType(""), - fRawWriter(0x0) + fTriggerResponseV1(kFALSE), + fTriggerCoinc44(0), + fTriggerEffCells(0), + fDigitizerWithNoise(1), + fIsTailEffect(kTRUE), + fRawWriter(0x0), + fDigitMaker(0x0), + fHitStore(0x0), + fDigitStoreConcreteClassName(), + fCalibrationData(0x0) { /// Default Constructor @@ -130,19 +134,13 @@ AliMUON::AliMUON() } //__________________________________________________________________ -AliMUON::AliMUON(const char *name, const char *title, - const char* sDigitizerClassName, - const char* digitizerClassName) - : AliDetector(name,title), +AliMUON::AliMUON(const char *name, const char* title) + : AliDetector(name, title), fNCh(AliMUONConstants::NCh()), fNTrackingCh(AliMUONConstants::NTrackingCh()), - fMUONData(0), fSplitLevel(0), fChambers(0), - fTriggerCircuits(0), - fTriggerCircuitsNew(0), fGeometryBuilder(0), - fSegmentation(0), fAccCut(kFALSE), fAccMin(0.), fAccMax(0.), @@ -152,17 +150,25 @@ AliMUON::AliMUON(const char *name, const char *title, fMaxDestepAlu(-1), // in the calculation of the tracking parameters fMaxIterPad(0), fCurIterPad(0), - fTriggerScalerEvent(kFALSE), - fSDigitizerType(sDigitizerClassName), - fDigitizerType(digitizerClassName), - fRawWriter(0x0) -{ -/// Standard constructor + fTriggerScalerEvent(kFALSE), + fTriggerResponseV1(kFALSE), + fTriggerCoinc44(0), + fTriggerEffCells(0), + fDigitizerWithNoise(1), + fIsTailEffect(kTRUE), + fRawWriter(0x0), + fDigitMaker(new AliMUONDigitMaker), + fHitStore(0x0), + fDigitStoreConcreteClassName("AliMUONDigitStoreV2S"), + fCalibrationData() + +{ + /// Standard constructor AliDebug(1,Form("ctor this=%p",this)); fIshunt = 0; - - SetMarkerColor(kRed);// + + //PH SetMarkerColor(kRed);// // Geometry builder fGeometryBuilder = new AliMUONGeometryBuilder(this); @@ -170,11 +176,11 @@ AliMUON::AliMUON(const char *name, const char *title, // Common geometry definitions fGeometryBuilder ->AddBuilder(new AliMUONCommonGeometryBuilder(this)); - + // By default, add also all the needed geometry builders. // If you want to change this from outside, please use ResetGeometryBuilder // method, followed by AddGeometryBuilder ones. - + AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(this)); AddGeometryBuilder(new AliMUONSt2GeometryBuilderV2(this)); AddGeometryBuilder(new AliMUONSlatGeometryBuilder(this)); @@ -184,7 +190,8 @@ AliMUON::AliMUON(const char *name, const char *title, // Creating List of Chambers Int_t ch; fChambers = new TObjArray(AliMUONConstants::NCh()); - + fChambers->SetOwner(kTRUE); + // Loop over stations for (Int_t st = 0; st < AliMUONConstants::NCh() / 2; st++) { // Loop over 2 chambers in the station @@ -200,18 +207,10 @@ AliMUON::AliMUON(const char *name, const char *title, } } // Chamber stCH (0, 1) in } // Station st (0...) - - // cp new design of AliMUONTriggerDecision - fTriggerCircuits = new TObjArray(AliMUONConstants::NTriggerCircuit()); - for (Int_t circ=0; circAddAt(new AliMUONTriggerCircuit(),circ); - } - - fTriggerCircuitsNew = new TObjArray(AliMUONConstants::NTriggerCircuit()); - for (Int_t circ=0; circAddAt(new AliMUONTriggerCircuitNew(),circ); - } - + + Int_t runnumber = AliCDBManager::Instance()->GetRun(); + + fCalibrationData = new AliMUONCalibrationData(runnumber); } //____________________________________________________________________ @@ -220,25 +219,12 @@ AliMUON::~AliMUON() /// Destructor AliDebug(1,Form("dtor this=%p",this)); - fIshunt = 0; - - if (fChambers){ - fChambers->Delete(); - delete fChambers; - } - if (fTriggerCircuits){ - fTriggerCircuits->Delete(); - delete fTriggerCircuits; - } - if (fTriggerCircuitsNew){ - fTriggerCircuitsNew->Delete(); - delete fTriggerCircuitsNew; - } - - delete fMUONData; + delete fChambers; delete fGeometryBuilder; - delete fSegmentation; delete fRawWriter; + delete fDigitMaker; + delete fHitStore; + delete fCalibrationData; } //_____________________________________________________________________________ @@ -287,22 +273,68 @@ const AliMUONGeometryTransformer* AliMUON::GetGeometryTransformer() const } //__________________________________________________________________ -void AliMUON::SetTreeAddress() +void +AliMUON::MakeBranch(Option_t* opt) { -/// Set Hits tree address - - GetMUONData()->SetLoader(fLoader); - // GetMUONData()->MakeBranch("D,S,RC"); - // GetMUONData()->SetTreeAddress("H,D,S,RC"); - GetMUONData()->SetTreeAddress("H"); - if (fHits != GetMUONData()->Hits()) { + /// Create branche(s) to hold MUON hits + AliDebug(1,""); + + TString sopt(opt); + if ( sopt != "H" ) return; + + if (!fHitStore) + { + fHitStore = new AliMUONHitStoreV1; if ( gAlice->GetMCApp() ) - if ( gAlice->GetMCApp()->GetHitLists() ) { - fHits = GetMUONData()->Hits(); - gAlice->GetMCApp()->AddHitList(fHits); // For purifyKine, only necessary when Hit list is created in AliMUONData + { + if ( gAlice->GetMCApp()->GetHitLists() ) + { + // AliStack::PurifyKine needs to be able to loop on our hits + // to remap the track numbers. + gAlice->GetMCApp()->AddHitList(fHitStore->Collection()); } + } } - fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector + + TTree* treeH = fLoader->TreeH(); + + if (!treeH) + { + AliFatal("No TreeH"); + } + + fHitStore->Connect(*treeH); +} + +//__________________________________________________________________ +void +AliMUON::SetTreeAddress() +{ + /// Set Hits tree address + +// if ( gAlice->GetMCApp() && fHitStore ) +// { +// TList* l = gAlice->GetMCApp()->GetHitLists(); +// if ( l ) +// { +// TObject* o = l->First(); +// if (o!=fHitStore->HitCollection()) +// { +// AliError(Form("Something is strange hitcollection=%x",fHitStore->HitCollection())); +// l->Print(); +// } +// } +// } +} + +//_________________________________________________________________ +void +AliMUON::ResetHits() +{ + /// Reset hits + + AliDebug(1,""); + if (fHitStore) fHitStore->Clear(); } //_________________________________________________________________ @@ -421,7 +453,7 @@ Float_t AliMUON::GetMaxDestepAlu() const } //____________________________________________________________________ -void AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response) +void AliMUON::SetResponseModel(Int_t id, const AliMUONResponse& response) { /// Set the response for chamber id ((AliMUONChamber*) fChambers->At(id))->SetResponseModel(response); @@ -430,45 +462,11 @@ void AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response) //____________________________________________________________________ AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const { -/// FIXME: the selection of the class should be done through a factory -/// mechanism. (see also Hits2SDigits()). - - AliInfo(Form("Digitizer used : %s",fDigitizerType.Data())); +/// Return digitizer - if ( fDigitizerType == "digitizer:default" ) - { - return new AliMUONDigitizerv2(manager); - } - else if ( fDigitizerType == "digitizer:NewDigitizerNewTrigger" ) - { - return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerElectronics); - } - else if ( fDigitizerType == "digitizer:NewDigitizerOldTrigger" ) - { - return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision, kFALSE, kFALSE); - } - else if ( fDigitizerType == "digitizer:NewDigitizerEffTrigger" ) - { - return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision, kTRUE, kFALSE); - } - else if ( fDigitizerType == "digitizer:NewDigitizerWithNoiseOldTrigger" ) - { - return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision, kFALSE, kTRUE); - } - else - { - AliFatal(Form("Unknown digitizer type : %s",fDigitizerType.Data())); - } - return 0x0; -} - -//_____________________________________________________________________ -TString -AliMUON::SDigitizerType() const -{ -/// Return digitizer type - - return fSDigitizerType; + AliMUONDigitizerV3* digitizer = new AliMUONDigitizerV3(manager, fDigitizerWithNoise); + digitizer->SetCalibrationData(fCalibrationData); + return digitizer; } //_____________________________________________________________________ @@ -485,43 +483,10 @@ void AliMUON::SDigits2Digits() //_____________________________________________________________________ void AliMUON::Hits2SDigits() { -/// FIXME: the selection of the sdigitizer should be done through a -/// factory mechanism. +/// Perform Hits2Digits using SDigitizerV2 - AliInfo(Form("SDigitizer used : %s",fSDigitizerType.Data())); - - if ( fSDigitizerType == "sdigitizer:default" ) - { - // Adaption of AliMUONSDigitizerv1 to be excuted by the AliSimulation framework - AliRunLoader* runLoader = fLoader->GetRunLoader(); - AliRunDigitizer * manager = new AliRunDigitizer(1,1); - manager->SetInputStream(0,runLoader->GetFileName(),AliConfig::GetDefaultEventFolderName()); - AliMUONDigitizer * dMUON = new AliMUONSDigitizerv1(manager); - fLoader->LoadHits("READ"); - for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) { - runLoader->GetEvent(iEvent); - dMUON->Exec(""); - } - fLoader->UnloadHits(); - } - else if ( fSDigitizerType == "sdigitizer:AliMUONSDigitizerV2" ) - { - TTask* sdigitizer = new AliMUONSDigitizerV2; - sdigitizer->ExecuteTask(); - } - else - { - AliFatal(Form("Unknown sdigitizer classname : %s",fSDigitizerType.Data())); - } -} - -//_____________________________________________________________________ -TString -AliMUON::DigitizerType() const -{ -/// Return digitizer type - - return fDigitizerType; + AliMUONSDigitizerV2 sdigitizer; + sdigitizer.ExecuteTask(); } //_____________________________________________________________________ @@ -529,19 +494,70 @@ void AliMUON::Digits2Raw() { /// Convert digits of the current event to raw data + AliRawDataHeaderSim header; + if (!fRawWriter) { - fRawWriter = new AliMUONRawWriter(fMUONData); + fRawWriter = new AliMUONRawWriter; + AliDebug(1,Form("Creating %s",fRawWriter->ClassName())); if (fTriggerScalerEvent == kTRUE) { fRawWriter->SetScalersNumbers(); } } - if (!fRawWriter->Digits2Raw()) + fLoader->LoadDigits("READ"); + + TTree* treeD = fLoader->TreeD(); + + if (!treeD) + { + AliError("Could not get TreeD"); + return; + } + + AliMUONVTriggerStore* triggerStore = AliMUONVTriggerStore::Create(*treeD); + AliMUONVDigitStore* digitStore = AliMUONVDigitStore::Create(*treeD); + + triggerStore->Connect(*treeD,kFALSE); + digitStore->Connect(*treeD,kFALSE); + + treeD->GetEvent(0); + + fRawWriter->SetHeader(header); + if (!fRawWriter->Digits2Raw(digitStore,triggerStore)) { AliError("pb writting raw data"); } + + delete triggerStore; + delete digitStore; + + fLoader->UnloadDigits(); +} + +//_____________________________________________________________________ +Bool_t AliMUON::Raw2SDigits(AliRawReader* rawReader) +{ +/// Convert raw data to SDigit + + fLoader->LoadDigits("READ"); + if (!fLoader->TreeS()) fLoader->MakeSDigitsContainer(); + + TTree* treeS = fLoader->TreeS(); + + AliMUONVDigitStore* sDigitStore = new AliMUONDigitStoreV1; + sDigitStore->Connect(*treeS); + + fDigitMaker->Raw2Digits(rawReader,sDigitStore,0x0); + + fLoader->WriteSDigits("OVERWRITE"); + + fLoader->UnloadSDigits(); + + delete sDigitStore; + + return kTRUE; } //_______________________________________________________________________ @@ -553,29 +569,8 @@ AliLoader* AliMUON::MakeLoader(const char* topfoldername) AliDebug(1,Form("Creating standard getter for detector %s. Top folder is %s.", GetName(),topfoldername)); fLoader = new AliLoader(GetName(),topfoldername); - fMUONData = new AliMUONData(fLoader,GetName(),GetName()); - fMUONData->SetSplitLevel(fSplitLevel); - return fLoader; -} -//_______________________________________________________________________ - -AliMUONRawCluster *AliMUON::RawCluster(Int_t ichamber, Int_t icathod, Int_t icluster) -{ -/// Return rawcluster (icluster) for chamber ichamber and cathode icathod -/// Obsolete ?? - TClonesArray *muonRawCluster = GetMUONData()->RawClusters(ichamber); - ResetRawClusters(); - TTree *treeR = fLoader->TreeR(); - Int_t nent=(Int_t)treeR->GetEntries(); - treeR->GetEvent(nent-2+icathod-1); - //treeR->GetEvent(icathod); - //Int_t nrawcl = (Int_t)muonRawCluster->GetEntriesFast(); - - AliMUONRawCluster * mRaw = (AliMUONRawCluster*)muonRawCluster->UncheckedAt(icluster); - //printf("RawCluster _ nent nrawcl icluster mRaw %d %d %d%p\n",nent,nrawcl,icluster,mRaw); - - return mRaw; + return fLoader; } //________________________________________________________________________ @@ -604,3 +599,85 @@ Bool_t AliMUON::GetTriggerResponseV1() const } +//____________________________________________________________________ +Int_t AliMUON::GetTriggerCoinc44() const +{ +/// +/// Returns fTriggerCoinc44 +/// + return fTriggerCoinc44; + +} + +//____________________________________________________________________ +Bool_t AliMUON::GetTriggerEffCells() const +{ +/// +/// Returns fTriggerEffCells +/// + return fTriggerEffCells; + +} + +//____________________________________________________________________ +Int_t AliMUON::GetDigitizerWithNoise() const +{ +/// +/// Returns fDigitizerWithNoise +/// + return fDigitizerWithNoise; + +} + +//____________________________________________________________________ +Bool_t AliMUON::UsingFastTrackerDecoder() const +{ +/// Checks to see if we are using the fast decoder for tracker DDL streams. + + if ( ! fDigitMaker ) { + AliError("Digit maker is not instantiated."); + return kFALSE; + } + + return fDigitMaker->UsingFastTrackerDecoder(); +} + +//____________________________________________________________________ +Bool_t AliMUON::UsingFastTriggerDecoder() const +{ +/// Checks to see if we are using the fast decoder for trigger DDL streams. + + if ( ! fDigitMaker ) { + AliError("Digit maker is not instantiated."); + return kFALSE; + } + + return fDigitMaker->UsingFastTriggerDecoder(); +} + +//____________________________________________________________________ +void AliMUON::SetFastTrackerDecoder(Bool_t useFastDecoder) +{ +/// Set fast raw data decoder + + if ( ! fDigitMaker ) { + AliError("Digit maker is not instantiated."); + return; + } + + fDigitMaker->SetFastTrackerDecoder(useFastDecoder); +} + +//____________________________________________________________________ +void AliMUON::SetFastTriggerDecoder(Bool_t useFastDecoder) +{ +/// Set fast raw data decoder + + if ( ! fDigitMaker ) { + AliError("Digit maker is not instantiated."); + return; + } + + fDigitMaker->SetFastTriggerDecoder(useFastDecoder); +} +