From: cblume Date: Tue, 19 Feb 2008 17:41:03 +0000 (+0000) Subject: Adaption to the new run type names X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=b70c68da2643dd8784f03b2ab20f94342ee41ea5 Adaption to the new run type names --- diff --git a/TRD/AliTRDCalibraFillHisto.cxx b/TRD/AliTRDCalibraFillHisto.cxx index d2dbc513d32..70e77b40019 100644 --- a/TRD/AliTRDCalibraFillHisto.cxx +++ b/TRD/AliTRDCalibraFillHisto.cxx @@ -63,7 +63,7 @@ #include "AliTRDpadPlane.h" #include "AliTRDcluster.h" #include "AliTRDtrackV1.h" -#include "AliTRDrawStreamTB.h" +#include "AliTRDrawStreamBase.h" #include "AliRawReader.h" #include "AliRawReaderDate.h" #include "AliTRDgeometry.h" @@ -130,6 +130,7 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto() ,fLinearFitterDebugOn(kFALSE) ,fRelativeScale(0) ,fThresholdClusterPRF2(15.0) + ,fLimitChargeIntegration(kFALSE) ,fCalibraMode(new AliTRDCalibraMode()) ,fDebugStreamer(0) ,fDebugLevel(0) @@ -192,6 +193,7 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) ,fLinearFitterDebugOn(c.fLinearFitterDebugOn) ,fRelativeScale(c.fRelativeScale) ,fThresholdClusterPRF2(c.fThresholdClusterPRF2) + ,fLimitChargeIntegration(c.fLimitChargeIntegration) ,fCalibraMode(0x0) ,fDebugStreamer(0) ,fDebugLevel(c.fDebugLevel) @@ -732,7 +734,7 @@ Bool_t AliTRDCalibraFillHisto::FindP1TrackPHtracklet(AliTRDtrack *t, Int_t index for(Int_t k = 0; k < npoints; k++){ AliTRDcluster *cl = (AliTRDcluster *) t->GetCluster(k+index0); - if(!cl->IsInChamber()) continue; + if((fLimitChargeIntegration) && (!cl->IsInChamber())) continue; Double_t ycluster = cl->GetY(); Int_t time = cl->GetPadTime(); Double_t timeis = time/fSf; @@ -881,7 +883,7 @@ Bool_t AliTRDCalibraFillHisto::FindP1TrackPHtrackletV1(const AliTRDseedV1 *track AliTRDcluster *cl = 0x0; for(int ic=0; icGetClusters(ic))) continue; - if(!cl->IsInChamber()) continue; + if((fLimitChargeIntegration) && (!cl->IsInChamber())) continue; Double_t ycluster = cl->GetY(); Int_t time = cl->GetPadTime(); @@ -1795,8 +1797,8 @@ void AliTRDCalibraFillHisto::StoreInfoCHPHtrack(AliTRDcluster *cl, Double_t dqdl // Fill the fAmpTotal with the charge - if (fCH2dOn && cl->IsInChamber()) { - fAmpTotal[(Int_t) group[0]] += correction; + if (fCH2dOn) { + if((!fLimitChargeIntegration) || (cl->IsInChamber())) fAmpTotal[(Int_t) group[0]] += correction; } // Fill the fPHPlace and value @@ -2093,10 +2095,10 @@ void AliTRDCalibraFillHisto::FillTheInfoOfTheTrackPH() // DAQ process functions ///////////////////////////////////////////////////////////////////////////////////////// //_____________________________________________________________________ -Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliTRDrawStreamTB *rawStream, Bool_t nocheck) +Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliTRDrawStreamBase *rawStream, Bool_t nocheck) { // - // Event Processing loop - AliTRDrawStreamTB + // Event Processing loop - AliTRDrawStreamBase // TestBeam 2007 version // 0 timebin problem // 1 no input @@ -2261,10 +2263,10 @@ Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliTRDrawStreamTB *rawStream, Bool } //_____________________________________________________________________ -Int_t AliTRDCalibraFillHisto::ProcessEventDAQV1(AliTRDrawStreamTB *rawStream, Bool_t nocheck) +Int_t AliTRDCalibraFillHisto::ProcessEventDAQV1(AliTRDrawStreamBase *rawStream, Bool_t nocheck) { // - // Event Processing loop - AliTRDrawStreamTB + // Event Processing loop - AliTRDrawStreamBase // Use old AliTRDmcmtracklet code // 0 timebin problem // 1 no input @@ -2442,7 +2444,7 @@ Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliRawReader *rawReader, Bool_t no // Testbeam 2007 version // - AliTRDrawStreamTB rawStream(rawReader); + AliTRDrawStreamBase rawStream(rawReader); rawReader->Select("TRD"); @@ -2484,7 +2486,7 @@ Int_t AliTRDCalibraFillHisto::ProcessEventDAQV1(AliRawReader *rawReader, Bool_t // use the old mcm traklet code // - AliTRDrawStreamTB rawStream(rawReader); + AliTRDrawStreamBase rawStream(rawReader); rawReader->Select("TRD"); diff --git a/TRD/AliTRDCalibraFillHisto.h b/TRD/AliTRDCalibraFillHisto.h index 87a7673081c..830e210a5ab 100644 --- a/TRD/AliTRDCalibraFillHisto.h +++ b/TRD/AliTRDCalibraFillHisto.h @@ -39,7 +39,7 @@ class AliRawReader; class AliTRDCalibraMode; class AliTRDCalibraVector; class AliTRDCalibraVdriftLinearFit; -class AliTRDrawStreamTB; +class AliTRDrawStreamBase; class AliTRDcluster; class AliTRDtrackV1; class AliTRDtrack; @@ -73,11 +73,11 @@ class AliTRDCalibraFillHisto : public TObject { Bool_t UpdateHistogramsV1(AliTRDtrackV1 *t); // Process events DAQ - Int_t ProcessEventDAQ(AliTRDrawStreamTB *rawStream, Bool_t nocheck = kFALSE); + Int_t ProcessEventDAQ(AliTRDrawStreamBase *rawStream, Bool_t nocheck = kFALSE); Int_t ProcessEventDAQ(AliRawReader *rawReader, Bool_t nocheck = kFALSE); Int_t ProcessEventDAQ(eventHeaderStruct *event, Bool_t nocheck = kFALSE); - Int_t ProcessEventDAQV1(AliTRDrawStreamTB *rawStream, Bool_t nocheck = kFALSE); + Int_t ProcessEventDAQV1(AliTRDrawStreamBase *rawStream, Bool_t nocheck = kFALSE); Int_t ProcessEventDAQV1(AliRawReader *rawReader, Bool_t nocheck = kFALSE); Int_t ProcessEventDAQV1(eventHeaderStruct *event, Bool_t nocheck = kFALSE); @@ -130,6 +130,7 @@ class AliTRDCalibraFillHisto : public TObject { // How to fill the 2D void SetRelativeScale(Float_t relativeScale); void SetThresholdClusterPRF2(Float_t thresholdClusterPRF2) { fThresholdClusterPRF2 = thresholdClusterPRF2; } + void SetLimitChargeIntegration(Bool_t limitChargeIntegration) { fLimitChargeIntegration = limitChargeIntegration; } void SetNz(Int_t i, Short_t nz); void SetNrphi(Int_t i, Short_t nrphi); void SetProcent(Float_t procent) { fProcent = procent; } @@ -142,6 +143,7 @@ class AliTRDCalibraFillHisto : public TObject { Float_t GetRelativeScale() const { return fRelativeScale; } Float_t GetThresholdClusterPRF2() const { return fThresholdClusterPRF2; } + Bool_t GetLimitChargeIntegration() const { return fLimitChargeIntegration; } Float_t GetProcent() const { return fProcent; } Short_t GetDifference() const { return fDifference; } Short_t GetNumberClusters() const { return fNumberClusters; } @@ -175,6 +177,7 @@ AliTRDCalibraVector *GetCalibraVector() const { r // How to fill the 2D Float_t fRelativeScale; // Scale of the deposited charge Float_t fThresholdClusterPRF2; // Threshold on cluster pad signals + Bool_t fLimitChargeIntegration; // Integration range for the gain calibration // Calibration mode AliTRDCalibraMode *fCalibraMode; // Calibration mode diff --git a/TRD/AliTRDPreprocessor.cxx b/TRD/AliTRDPreprocessor.cxx index 09bc84ab915..7222a5ca156 100644 --- a/TRD/AliTRDPreprocessor.cxx +++ b/TRD/AliTRDPreprocessor.cxx @@ -93,12 +93,12 @@ UInt_t AliTRDPreprocessor::Process(TMap* dcsAliasMap) TString runType = GetRunType(); Log(Form("runtype %s\n",runType.Data())); - if (runType=="PEDESTAL_RUN"){ + if (runType=="PEDESTAL"){ if(ExtractPedestals()) return 1; return 0; } - if (runType=="PHYSICS"){ + if ((runType=="PHYSICS") || (runType=="STANDALONE")){ // DCS if(ProcessDCS(dcsAliasMap)) return 1; // HLT if On @@ -125,7 +125,7 @@ Bool_t AliTRDPreprocessor::ProcessDCS() // TString runType = GetRunType(); - if (runType == "PHYSICS") { + if ((runType == "PHYSICS") || (runType == "STANDALONE")) { return kTRUE; } return kFALSE; diff --git a/TRD/AliTRDrawStreamBase.h b/TRD/AliTRDrawStreamBase.h index 98dc6568725..4dd6c25e749 100644 --- a/TRD/AliTRDrawStreamBase.h +++ b/TRD/AliTRDrawStreamBase.h @@ -117,7 +117,9 @@ class AliTRDrawStreamBase : public TObject virtual Int_t *GetSignals() const {TRD_NOIMP(); return 0;} virtual Int_t GetADC() const {TRD_NOIMP(); return 0;} virtual Int_t GetTimeBin() const {TRD_NOIMP(); return 0;} - + + virtual Int_t GetCommonAdditive() const {TRD_NOIMP(); return 0;} + //---------------------------------------------------------- protected: