X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDPreprocessor.cxx;h=93a787e2f58e9b3e06e974a00ef1e96f61ca8ae5;hb=3a457cdb20b5a3613d7087185daa7563f9e0633c;hp=7707000ad33110b8b499525417c79b4252511a9a;hpb=650ccfcf57e3f212196d0a83c6e52cf75c50c4aa;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRDPreprocessor.cxx b/TRD/AliTRDPreprocessor.cxx index 7707000ad33..93a787e2f58 100644 --- a/TRD/AliTRDPreprocessor.cxx +++ b/TRD/AliTRDPreprocessor.cxx @@ -99,14 +99,8 @@ AliTRDPreprocessor::~AliTRDPreprocessor() // Destructor // - if (fCalDCSObjSOR != NULL) { - delete fCalDCSObjSOR; - fCalDCSObjSOR =0; - } - if (fCalDCSObjEOR != NULL) { - delete fCalDCSObjEOR; - fCalDCSObjEOR =0; - } + if (fCalDCSObjSOR ) delete fCalDCSObjSOR; + if (fCalDCSObjEOR ) delete fCalDCSObjEOR; } //______________________________________________________________________________________________ @@ -137,8 +131,8 @@ UInt_t AliTRDPreprocessor::Process(TMap* dcsAliasMap) Log(Form("runtype %s\n",runType.Data())); // always process the configuration data - Int_t DCSConfigReturn = ProcessDCSConfigData(); - if(DCSConfigReturn) return DCSConfigReturn; + Int_t dCSConfigReturn = ProcessDCSConfigData(); + if(dCSConfigReturn) return dCSConfigReturn; if (runType=="PEDESTAL"){ if(ExtractPedestals()) return 1; @@ -148,6 +142,7 @@ UInt_t AliTRDPreprocessor::Process(TMap* dcsAliasMap) if ((runType=="PHYSICS") || (runType=="STANDALONE") || (runType=="DAQ")){ // DCS if(ProcessDCS(dcsAliasMap)) return 1; + /* if(runType=="PHYSICS"){ // HLT if On //TString runPar = GetRunParameter("HLTStatus"); @@ -162,9 +157,8 @@ UInt_t AliTRDPreprocessor::Process(TMap* dcsAliasMap) ExtractDriftVelocityDAQ(); // for testing! } } - //if((runType=="PHYSICS") || (runType=="STANDALONE")) { - // if(ExtractHalfChamberStatusDAQ()) return 1; - //} + */ + } return 0; @@ -612,7 +606,7 @@ Bool_t AliTRDPreprocessor::ExtractPedestals() } //__________________________________________________________________ -Bool_t AliTRDPreprocessor::AreThereDataPedestal(AliTRDCalSingleChamberStatus * const calROCStatus +Bool_t AliTRDPreprocessor::AreThereDataPedestal(const AliTRDCalSingleChamberStatus * const calROCStatus , Bool_t second) {