X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUON.cxx;h=8509e3670747057fa7f66a13d2eb3a086caeed23;hb=b7474abb6e3c8c4a0f3c5dfc6c8bc3a86802e4ab;hp=22a13c023755286a80616819ed3041a6d95798c5;hpb=e93b11d042b2c9b554d8e6fbef302e7981fdeeba;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx index 22a13c02375..8509e367074 100644 --- a/MUON/AliMUON.cxx +++ b/MUON/AliMUON.cxx @@ -15,69 +15,53 @@ /* $Id$ */ -// ------------------ +//----------------------------------------------------------------------------- // Class AliMUON // ------------------ // AliDetector class for MUON subsystem // providing simulation data management +//----------------------------------------------------------------------------- -#include "Riostream.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//#include "AliHeader.h" -#include "AliLoader.h" -#include "AliRunDigitizer.h" -#include "AliMC.h" -#include "AliRun.h" +#include #include "AliMUON.h" + +#include "AliMUONSDigitizerV2.h" +#include "AliMUONDigitizerV3.h" +#include "AliMUONDigitMaker.h" +#include "AliMUONDigit.h" +#include "AliMUONCalibrationData.h" + +#include "AliMUONDigitStoreV1.h" +#include "AliMUONTriggerStoreV1.h" +#include "AliMUONHitStoreV1.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 "AliMUONCommonGeometryBuilder.h" #include "AliMUONSt1GeometryBuilderV2.h" #include "AliMUONSt2GeometryBuilderV2.h" #include "AliMUONSlatGeometryBuilder.h" #include "AliMUONTriggerGeometryBuilder.h" +#include "AliMUONDigitCalibrator.h" +#include "AliMUONRecoParam.h" +#include "AliCDBManager.h" +#include "AliCDBEntry.h" + +#include "AliMUONRawWriter.h" + +#include "AliLoader.h" +#include "AliCDBManager.h" +#include "AliDigitizationInput.h" +#include "AliMC.h" +#include "AliRun.h" +#include "AliRawDataHeaderSim.h" +#include "AliLog.h" + +#include // Defaults parameters for Z positions of chambers // taken from values for "stations" in AliMUON::AliMUON @@ -102,13 +86,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.), @@ -118,12 +98,21 @@ AliMUON::AliMUON() fMaxDestepAlu(0.), fMaxIterPad(0), fCurIterPad(0), + fIsMaxStep(kTRUE), fTriggerScalerEvent(kFALSE), fTriggerResponseV1(kFALSE), fTriggerCoinc44(0), - fSDigitizerType(""), - fDigitizerType(""), - fRawWriter(0x0) + fTriggerEffCells(0), + fDigitizerWithNoise(1), + fDigitizerNSigmas(4.0), + fIsTailEffect(kTRUE), + fConvertTrigger(kFALSE), + fRawWriter(0x0), + fDigitMaker(0x0), + fHitStore(0x0), + fDigitStoreConcreteClassName(), + fCalibrationData(0x0), + fDigitCalibrator(0x0) { /// Default Constructor @@ -132,19 +121,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.), @@ -154,19 +137,28 @@ AliMUON::AliMUON(const char *name, const char *title, fMaxDestepAlu(-1), // in the calculation of the tracking parameters fMaxIterPad(0), fCurIterPad(0), + fIsMaxStep(kTRUE), fTriggerScalerEvent(kFALSE), fTriggerResponseV1(kFALSE), fTriggerCoinc44(0), - fSDigitizerType(sDigitizerClassName), - fDigitizerType(digitizerClassName), - fRawWriter(0x0) -{ -/// Standard constructor + fTriggerEffCells(0), + fDigitizerWithNoise(1), + fDigitizerNSigmas(4.0), + fIsTailEffect(kTRUE), + fConvertTrigger(kFALSE), + fRawWriter(0x0), + fDigitMaker(new AliMUONDigitMaker), + fHitStore(0x0), + fDigitStoreConcreteClassName("AliMUONDigitStoreV2S"), + fCalibrationData(), + fDigitCalibrator(0x0) +{ + /// Standard constructor AliDebug(1,Form("ctor this=%p",this)); fIshunt = 0; - - SetMarkerColor(kRed);// + + //PH SetMarkerColor(kRed);// // Geometry builder fGeometryBuilder = new AliMUONGeometryBuilder(this); @@ -174,11 +166,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)); @@ -188,7 +180,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 @@ -204,18 +197,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); } //____________________________________________________________________ @@ -224,25 +209,13 @@ 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; + delete fDigitCalibrator; } //_____________________________________________________________________________ @@ -253,18 +226,6 @@ void AliMUON::AddGeometryBuilder(AliMUONVGeometryBuilder* geomBuilder) fGeometryBuilder->AddBuilder(geomBuilder); } -//____________________________________________________________________ -void AliMUON::BuildGeometry() -{ -/// Geometry for event display - - -// for (Int_t i = 0; i < AliMUONConstants::NCh(); i++) -// this->Chamber(i).SegmentationModel2(1)->Draw("eventdisplay");// to be check ! - - -} - //____________________________________________________________________ const AliMUONGeometry* AliMUON::GetGeometry() const { @@ -291,22 +252,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()); } + } + } + + TTree* treeH = fLoader->TreeH(); + + if (!treeH) + { + AliFatal("No TreeH"); } - fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector + + 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(); } //_________________________________________________________________ @@ -425,54 +432,21 @@ 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); } //____________________________________________________________________ -AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const +AliDigitizer* AliMUON::CreateDigitizer(AliDigitizationInput* digInput) 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(digInput, fDigitizerWithNoise); + AliMUONDigitizerV3::SetNSigmas(fDigitizerNSigmas); + digitizer->SetCalibrationData(fCalibrationData,GetRecoParam()); + return digitizer; } //_____________________________________________________________________ @@ -489,63 +463,119 @@ 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())); + AliMUONSDigitizerV2 sdigitizer; + sdigitizer.Digitize(); +} - if ( fSDigitizerType == "sdigitizer:default" ) +//_____________________________________________________________________ +void AliMUON::Digits2Raw() +{ +/// Convert digits of the current event to raw data + + AliRawDataHeaderSim header; + + if (!fRawWriter) { - // 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(""); + fRawWriter = new AliMUONRawWriter; + AliDebug(1,Form("Creating %s",fRawWriter->ClassName())); + if (fTriggerScalerEvent == kTRUE) + { + fRawWriter->SetScalersNumbers(); } - fLoader->UnloadHits(); } - else if ( fSDigitizerType == "sdigitizer:AliMUONSDigitizerV2" ) + + fLoader->LoadDigits("READ"); + + TTree* treeD = fLoader->TreeD(); + + if (!treeD) { - TTask* sdigitizer = new AliMUONSDigitizerV2; - sdigitizer->ExecuteTask(); + AliError("Could not get TreeD"); + return; } - else + + 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)) { - AliFatal(Form("Unknown sdigitizer classname : %s",fSDigitizerType.Data())); + AliError("pb writting raw data"); } + + delete triggerStore; + delete digitStore; + + fLoader->UnloadDigits(); } //_____________________________________________________________________ -TString -AliMUON::DigitizerType() const -{ -/// Return digitizer type - - return fDigitizerType; -} - -//_____________________________________________________________________ -void AliMUON::Digits2Raw() +Bool_t AliMUON::Raw2SDigits(AliRawReader* rawReader) { -/// Convert digits of the current event to raw data - - if (!fRawWriter) + /// Convert raw data to SDigit + + if (!fLoader->TreeS()) fLoader->MakeSDigitsContainer(); + + TTree* treeS = fLoader->TreeS(); + + AliMUONVDigitStore* sDigitStore = AliMUONVDigitStore::Create(DigitStoreClassName()); + AliMUONVTriggerStore* triggerStore = 0x0; + + sDigitStore->Connect(*treeS); + + if (!fDigitMaker) fDigitMaker = new AliMUONDigitMaker; + + if (fConvertTrigger) { + triggerStore = new AliMUONTriggerStoreV1; + triggerStore->Connect(*treeS,true); + fDigitMaker->SetMakeTriggerDigits(true); + } + + if (!fDigitCalibrator) { - fRawWriter = new AliMUONRawWriter(fMUONData); - if (fTriggerScalerEvent == kTRUE) + AliMUONRecoParam* recoParam = GetRecoParam(); + + if (!recoParam) { - fRawWriter->SetScalersNumbers(); + AliFatal("Cannot work without recoparams !"); } + + fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,recoParam); } - if (!fRawWriter->Digits2Raw()) + fDigitMaker->Raw2Digits(rawReader,sDigitStore,triggerStore); + + fDigitCalibrator->Calibrate(*sDigitStore); + + TIter next(sDigitStore->CreateIterator()); + AliMUONDigit* sdigit; + + // now tweak the digits to make them "as fresh as possible", i.e. + // reset their calibrated status, as they'll be calibrated again + // once embedded. + while ( ( sdigit = static_cast(next()) ) ) { - AliError("pb writting raw data"); + sdigit->Calibrated(kFALSE); } + + treeS->Fill(); + + fLoader->WriteSDigits("OVERWRITE"); + + fLoader->UnloadSDigits(); + + delete sDigitStore; + + delete triggerStore; + + return kTRUE; } //_______________________________________________________________________ @@ -557,29 +587,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; } //________________________________________________________________________ @@ -616,5 +625,51 @@ Int_t AliMUON::GetTriggerCoinc44() const /// return fTriggerCoinc44; +} + +//____________________________________________________________________ +Bool_t AliMUON::GetTriggerEffCells() const +{ +/// +/// Returns fTriggerEffCells +/// + return fTriggerEffCells; + +} + +//____________________________________________________________________ +Int_t AliMUON::GetDigitizerWithNoise() const +{ +/// +/// Returns fDigitizerWithNoise +/// + return fDigitizerWithNoise; + } +//____________________________________________________________________ +AliMUONRecoParam* AliMUON::GetRecoParam() const +{ + AliMUONRecoParam* recoParam = 0x0; + + AliCDBEntry* entry = AliCDBManager::Instance()->Get("MUON/Calib/RecoParam"); + + if (entry) + { + // load recoParam according OCDB content (single or array) + if (!(recoParam = dynamic_cast(entry->GetObject()))) + { + TObjArray* recoParamArray = static_cast(entry->GetObject()); + + for(Int_t i = 0; i < recoParamArray->GetEntriesFast(); ++i) + { + recoParam = static_cast(recoParamArray->UncheckedAt(i)); + if (recoParam && recoParam->IsDefault()) break; + recoParam = 0x0; + } + } + } + return recoParam; +} + +