X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALPreprocessor.cxx;h=3a30a83bafcaaa6fc1547d5cfc774412402c6257;hb=db3c699080f7e27ce563e9e42f4cce2ababb3bb8;hp=92c13b4c3b2260bf84698080bb791fd4b6becffe;hpb=8f79a6d7966bc144f245e03ebf8c7df2e25ccca4;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALPreprocessor.cxx b/EMCAL/AliEMCALPreprocessor.cxx index 92c13b4c3b2..3a30a83bafc 100644 --- a/EMCAL/AliEMCALPreprocessor.cxx +++ b/EMCAL/AliEMCALPreprocessor.cxx @@ -45,8 +45,8 @@ const Int_t kValCutTemp = 100; // discard temperatures > 100 degre const Int_t kDiffCutTemp = 5; // discard temperature differences > 5 degrees const TString kPedestalRunType = "PEDESTAL"; // pedestal run identifier const TString kPhysicsRunType = "PHYSICS"; // physics run identifier -const TString kStandAloneRunType = "STANDALONE"; // standalone run identifier -const TString kAmandaTemp = "PT_%02d_TEMPERATURE"; // Amanda string for temperature entries +const TString kStandAloneRunType = "STANDALONE_BC"; // standalone run identifier +const TString kAmandaTemp = "PT_%02d.Temperature"; // Amanda string for temperature entries //const Double_t kFitFraction = 0.7; // Fraction of DCS sensor fits required const Double_t kFitFraction = -1.0; // Don't require minimum number of fits during commissioning @@ -81,7 +81,6 @@ AliEMCALPreprocessor::AliEMCALPreprocessor(AliShuttleInterface* shuttle): // define run types to be processed AddRunType(kPedestalRunType); AddRunType(kPhysicsRunType); - AddRunType(kStandAloneRunType); } //______________________________________________________________________________________________ @@ -168,7 +167,7 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap) UInt_t dcsResult=0; if (errorHandling == "OFF" ) { if (!dcsAliasMap) dcsResult = kReturnCodeNoEntries; - if (dcsAliasMap->GetEntries() == 0 ) dcsResult = kReturnCodeNoEntries; + else if (dcsAliasMap->GetEntries() == 0 ) dcsResult = kReturnCodeNoEntries; status = new TParameter("dcsResult",dcsResult); resultArray->Add(status); } @@ -199,7 +198,7 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap) // PEDESTAL ENTRIES: - if(runType == kPedestalRunType) { + if ( runType == kPedestalRunType ) { Int_t numSources = 1; Int_t pedestalSource[2] = {AliShuttleInterface::kDAQ, AliShuttleInterface::kHLT} ; TString source = fConfEnv->GetValue("Pedestal","DAQ"); @@ -208,15 +207,15 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap) if ( source == "HLT") pedestalSource[0] = AliShuttleInterface::kHLT; if (!GetHLTStatus()) pedestalSource[0] = AliShuttleInterface::kDAQ; if (source == "HLTDAQ" ) { - numSources=2; - pedestalSource[0] = AliShuttleInterface::kHLT; - pedestalSource[1] = AliShuttleInterface::kDAQ; + numSources=2; + pedestalSource[0] = AliShuttleInterface::kHLT; + pedestalSource[1] = AliShuttleInterface::kDAQ; } if (source == "DAQHLT" ) numSources=2; UInt_t pedestalResult=0; for (Int_t i=0; i("pedestalResult",pedestalResult); @@ -225,8 +224,7 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap) } // SIGNAL/LED ENTRIES: - - if( runType == kPhysicsRunType || runType == kStandAloneRunType ) { + if( runType == kPhysicsRunType ) { Int_t numSources = 1; Int_t signalSource[2] = {AliShuttleInterface::kDAQ,AliShuttleInterface::kHLT} ; TString source = fConfEnv->GetValue("Signal","DAQ"); @@ -235,15 +233,15 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap) if ( source == "HLT") signalSource[0] = AliShuttleInterface::kHLT; if (!GetHLTStatus()) signalSource[0] = AliShuttleInterface::kDAQ; if (source == "HLTDAQ" ) { - numSources=2; - signalSource[0] = AliShuttleInterface::kHLT; - signalSource[1] = AliShuttleInterface::kDAQ; + numSources=2; + signalSource[0] = AliShuttleInterface::kHLT; + signalSource[1] = AliShuttleInterface::kDAQ; } if (source == "DAQHLT" ) numSources=2; UInt_t signalResult=0; for (Int_t i=0; i("signalResult",signalResult); @@ -311,21 +309,14 @@ UInt_t AliEMCALPreprocessor::ExtractPedestals(Int_t sourceFXS) UInt_t result=0; // // Read pedestal file from file exchange server - // Keep original entry from OCDB in case no new pedestals are available + // Only store if new pedestal info is available // - AliCaloCalibPedestal *calibPed=0; - AliCDBEntry* entry = GetFromOCDB("Calib", "Pedestals"); - if (entry) calibPed = (AliCaloCalibPedestal*)entry->GetObject(); - if ( calibPed==NULL ) { - Log("AliEMCALPreprocessor: No previous EMCAL pedestal entry available.\n"); - calibPed = new AliCaloCalibPedestal(AliCaloCalibPedestal::kEmCal); - } - + AliCaloCalibPedestal *calibPed = new AliCaloCalibPedestal(AliCaloCalibPedestal::kEmCal); + calibPed->Init(); + TList* list = GetFileSources(sourceFXS,"pedestals"); if (list && list->GetEntries()>0) { - calibPed->Reset(); // let's make a fresh start before possibly adding stuff below - // loop through all files from LDCs int changes = 0; @@ -387,21 +378,13 @@ UInt_t AliEMCALPreprocessor::ExtractSignal(Int_t sourceFXS) UInt_t result=0; // // Read signal file from file exchange server - // Keep original entry from OCDB in case no new signal are available + // Only store if new signal info is available // - AliCaloCalibSignal *calibSig=0; - AliCDBEntry* entry = GetFromOCDB("Calib", "Signal"); - if (entry) calibSig = (AliCaloCalibSignal*)entry->GetObject(); - if ( calibSig==NULL ) { - Log("AliEMCALPreprocessor: No previous EMCAL signal entry available.\n"); - calibSig = new AliCaloCalibSignal(AliCaloCalibSignal::kEmCal); - } + AliCaloCalibSignal *calibSig = new AliCaloCalibSignal(AliCaloCalibSignal::kEmCal); TList* list = GetFileSources(sourceFXS,"signal"); if (list && list->GetEntries()>0) { - - calibSig->Reset(); // let's make a fresh start before possibly adding stuff below - + // loop through all files from LDCs int changes = 0; @@ -445,7 +428,7 @@ UInt_t AliEMCALPreprocessor::ExtractSignal(Int_t sourceFXS) metaData.SetResponsible(kMetaResponsible); metaData.SetComment(kMetaComment); - Bool_t storeOK = Store("Calib", "Signal", calibSig, &metaData, 0, kFALSE); + Bool_t storeOK = Store("Calib", "LED", calibSig, &metaData, 0, kFALSE); if ( !storeOK ) result++; } }