From: panos Date: Thu, 4 Oct 2007 15:23:10 +0000 (+0000) Subject: A few mods in the GRP preprocessor (to get some greens finally) X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=958ecabf850a99f18e7ae9cdb9be4369a4f7c9eb;hp=8b1c76deb2696ae9d65537b45cd47b627a317471;p=u%2Fmrichter%2FAliRoot.git A few mods in the GRP preprocessor (to get some greens finally) --- diff --git a/STEER/AliGRPDCS.cxx b/STEER/AliGRPDCS.cxx index 86df227ff55..d3b539b1c81 100644 --- a/STEER/AliGRPDCS.cxx +++ b/STEER/AliGRPDCS.cxx @@ -50,10 +50,11 @@ AliGRPDCS::AliGRPDCS(TObjArray *dcsArray, UInt_t fStart, UInt_t fStop): //___________________________________________________________________________ AliGRPDCS::AliGRPDCS(const AliGRPDCS& grpDcs): TObject(grpDcs), - fStartTime(grpDcs.fStartTime), fStopTime(grpDcs.fStopTime) { + fStartTime(grpDcs.fStartTime), fStopTime(grpDcs.fStopTime), + fDCSArray(grpDcs.fDCSArray) { //copy constructor - if (grpDcs.fDCSArray) fDCSArray = new TObjArray(); + //if (grpDcs.fDCSArray) fDCSArray = new TObjArray(); } //_______________________________________________________________ @@ -81,7 +82,6 @@ const char* AliGRPDCS::ProcessDCS(Int_t iType) { } case 3: { fDCSDataPointValue += ProcessString(); - cout<GetEntries()); + //printf("Start: %d - Stop: %d\n",fStartTime,fStopTime); for(Int_t i = 0; i < fDCSArray->GetEntries(); i++) { AliDCSValue *v = (AliDCSValue *)fDCSArray->At(i); if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fStopTime)) { @@ -155,55 +157,40 @@ const char* AliGRPDCS::ProcessFloat() { //_______________________________________________________________ const char* AliGRPDCS::ProcessString() { TString fDCSString, fDCSTemp; - Bool_t kFound = kFALSE; - Int_t iCount = 0; AliDCSValue *v = 0x0; - printf("Entries: %d\n",fDCSArray->GetEntries()); - printf("Start: %d - Stop: %d\n",fStartTime,fStopTime); - - while(!kFound) { + //printf("Entries: %d\n",fDCSArray->GetEntries()); + //printf("Start: %d - Stop: %d\n",fStartTime,fStopTime); + + for(Int_t iCount = 0; iCount < fDCSArray->GetEntries(); iCount++) { v = (AliDCSValue *)fDCSArray->At(iCount); - iCount += 1; - cout<<"Time: "<GetTimeStamp()<GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fStopTime)) kFound = kTRUE; - } - fDCSTemp = v->GetChar(); - cout<<"Found: "<GetEntries(); i++) { - AliDCSValue *v1 = (AliDCSValue *)fDCSArray->At(i); - if((v1->GetTimeStamp() >= fStartTime) &&(v1->GetTimeStamp() <= fStopTime)) { - fDCSString = v1->GetChar(); - if(fDCSTemp != fDCSString) AliFatal("DCS data point value changed within the run!!!"); - } + if ((v->GetTimeStamp() >= fStartTime) && (v->GetTimeStamp() <= fStopTime)) + AliError(Form("DCS values for the parameter changed within the queried interval")); + if (v->GetTimeStamp() > fStopTime) continue; + fDCSString = v->GetChar(); } + TString fDCSDataPointValue = fDCSString; - cout<<"Returned String: "<GetEntries(); iCount++) { v = (AliDCSValue *)fDCSArray->At(iCount); - iCount += 1; - if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fStopTime)) kFound = kTRUE; - } - fDCSTemp = v->GetBool(); - for(Int_t i = 0; i < fDCSArray->GetEntries(); i++) { - AliDCSValue *v1 = (AliDCSValue *)fDCSArray->At(i); - if((v1->GetTimeStamp() >= fStartTime) &&(v1->GetTimeStamp() <= fStopTime)) { - fDCSBool = v1->GetBool(); - if(fDCSTemp != fDCSBool) AliFatal("DCS data point value changed within the run!!!"); - } + if ((v->GetTimeStamp() >= fStartTime) && (v->GetTimeStamp() <= fStopTime)) + AliError(Form("DCS values for the parameter changed within the queried interval")); + if (v->GetTimeStamp() > fStopTime) continue; + fDCSBool = v->GetBool(); } + TString fDCSDataPointValue = fDCSBool; return fDCSDataPointValue.Data(); diff --git a/STEER/AliGRPPreprocessor.cxx b/STEER/AliGRPPreprocessor.cxx index dae280fd692..b21f51d3826 100644 --- a/STEER/AliGRPPreprocessor.cxx +++ b/STEER/AliGRPPreprocessor.cxx @@ -86,19 +86,17 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { TList* list = GetFileSources(kDAQ); TIterator* iter = list->MakeIterator(); TObject* obj = 0; - while ((obj = iter->Next())) - { - TObjString* objStr = dynamic_cast (obj); - if (objStr) - { - Log(Form("Found source %s", objStr->String().Data())); - TList* list2 = GetFileIDs(kDAQ, objStr->String()); - list2->Print(); - delete list2; - } - } - delete iter; - delete list; + while ((obj = iter->Next())) { + TObjString* objStr = dynamic_cast (obj); + if (objStr) { + Log(Form("Found source %s", objStr->String().Data())); + TList* list2 = GetFileIDs(kDAQ, objStr->String()); + list2->Print(); + delete list2; + } + } + delete iter; + delete list; //===========// //DCS data points @@ -108,6 +106,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("LHCState not found!!!")); return 1; } + AliInfo(Form("==========LHCState===========")); AliGRPDCS *dcs1 = new AliGRPDCS(aliasLHCState,iStartTime,iStopTime); TString sLHCState = dcs1->ProcessDCS(3); if (sLHCState) { @@ -121,6 +120,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("LHCPeriod not found!!!")); return 1; } + AliInfo(Form("==========LHCPeriod===========")); AliGRPDCS *dcs2 = new AliGRPDCS(aliasLHCPeriod,iStartTime,iStopTime); TString sLHCPeriod = dcs2->ProcessDCS(3); if (sLHCPeriod) { @@ -134,6 +134,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("LHCLuminosity not found!!!")); return 1; } + AliInfo(Form("==========LHCLuminosity===========")); AliGRPDCS *dcs3 = new AliGRPDCS(aliasLHCLuminosity,iStartTime,iStopTime); TString sMeanLHCLuminosity = dcs3->ProcessDCS(2); if (sMeanLHCLuminosity) { @@ -147,6 +148,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("BeamIntensity not found!!!")); return 1; } + AliInfo(Form("==========BeamIntensity===========")); AliGRPDCS *dcs4 = new AliGRPDCS(aliasBeamIntensity,iStartTime,iStopTime); TString sMeanBeamIntensity = dcs4->ProcessDCS(2); if (sMeanBeamIntensity) { @@ -160,6 +162,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("L3Current not found!!!")); return 1; } + AliInfo(Form("==========L3Current===========")); AliGRPDCS *dcs5 = new AliGRPDCS(aliasL3Current,iStartTime,iStopTime); TString sMeanL3Current = dcs5->ProcessDCS(2); if (sMeanL3Current) { @@ -173,6 +176,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("L3Polarity not found!!!")); return 1; } + AliInfo(Form("==========L3Polarity===========")); AliGRPDCS *dcs6 = new AliGRPDCS(aliasL3Polarity,iStartTime,iStopTime); TString sL3Polarity = dcs6->ProcessDCS(4); if (sL3Polarity) { @@ -186,6 +190,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("DipoleCurrent not found!!!")); return 1; } + AliInfo(Form("==========DipoleCurrent===========")); AliGRPDCS *dcs7 = new AliGRPDCS(aliasDipoleCurrent,iStartTime,iStopTime); TString sMeanDipoleCurrent = dcs7->ProcessDCS(2); if (sMeanDipoleCurrent) { @@ -199,6 +204,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("DipolePolarity not found!!!")); return 1; } + AliInfo(Form("==========DipolePolarity===========")); AliGRPDCS *dcs8 = new AliGRPDCS(aliasDipolePolarity,iStartTime,iStopTime); TString sDipolePolarity = dcs8->ProcessDCS(4); if (sDipolePolarity) { @@ -212,6 +218,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("CavernTemperature not found!!!")); return 1; } + AliInfo(Form("==========CavernTemperature===========")); AliGRPDCS *dcs9 = new AliGRPDCS(aliasCavernTemperature,iStartTime,iStopTime); TString sMeanCavernTemperature = dcs9->ProcessDCS(2); if (sMeanCavernTemperature) { @@ -225,6 +232,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) { Log(Form("CavernPressure not found!!!")); return 1; } + AliInfo(Form("==========CavernPressure===========")); AliGRPDCS *dcs10 = new AliGRPDCS(aliasCavernPressure,iStartTime,iStopTime); TString sMeanCavernPressure = dcs10->ProcessDCS(2); if (sMeanCavernPressure) {