const TString kLaserRunType = "LASER"; // laser run identifier
const TString kDaqRunType = "DAQ"; // DAQ run identifier
const TString kAmandaTemp = "TPC_PT_%d_TEMPERATURE"; // Amanda string for temperature entries
+const TString kAmandaDDL = "DDL%d"; // Amanda string for list of active DDLs
+const Int_t kNumDDL = 216; // number of TPC DDLs
+const Int_t kFirstDDL = 768; // identifier of first DDL
//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 in commissioning run
const Int_t kNumPressureSensors = 3; // number of pressure sensors
fConfigOK = kFALSE;
return;
}
- fHighVoltage = new AliDCSSensorArray(startTime, endTime, confTree);
+ time_t timeStart = (time_t)(((TString)GetRunParameter("DAQ_time_start")).Atoi());
+ time_t timeEnd = (time_t)(((TString)GetRunParameter("DAQ_time_end")).Atoi());
+ fHighVoltage = new AliDCSSensorArray (UInt_t(timeStart),
+ UInt_t(timeEnd), confTree);
}
// High voltage status values
tempConf.ToUpper();
if (tempConf != "OFF" ) {
UInt_t tempResult = MapTemperature(dcsAliasMap);
- result=tempResult;
+ if ( tempConf != "TRY") result+=tempResult;
status = new TParameter<int>("tempResult",tempResult);
resultArray->Add(status);
}
hvConf.ToUpper();
if (hvConf != "OFF" ) {
UInt_t hvResult = MapHighVoltage(dcsAliasMap);
- result+=hvResult;
+ if (hvConf != "TRY") result+=hvResult;
status = new TParameter<int>("hvResult",hvResult);
resultArray->Add(status);
}
goofieConf.ToUpper();
if (goofieConf != "OFF" ) {
UInt_t goofieResult = MapGoofie(dcsAliasMap);
- result+=goofieResult;
+ if (goofieConf != "TRY") result+=goofieResult;
status = new TParameter<int>("goofieResult",goofieResult);
resultArray->Add(status);
}
pulserSource[1] = AliShuttleInterface::kDAQ;
}
if (source == "DAQHLT" ) numSources=2;
+ if (source == "TRY" ) numSources=2;
UInt_t pulserResult=0;
for (Int_t i=0; i<numSources; i++ ) {
pulserResult = ExtractPulser(pulserSource[i]);
if ( pulserResult == 0 ) break;
}
- result += pulserResult;
+ if (source != "TRY") result += pulserResult;
status = new TParameter<int>("pulserResult",pulserResult);
resultArray->Add(status);
}
rawSource[1] = AliShuttleInterface::kDAQ;
}
if (source == "DAQHLT" ) numSources=2;
+ if (source == "TRY" ) numSources=2;
UInt_t rawResult=0;
for (Int_t i=0; i<numSources; i++ ) {
rawResult = ExtractRaw(rawSource[i]);
if ( rawResult == 0 ) break;
}
- result += rawResult;
+ if (source != "TRY" )result += rawResult;
status = new TParameter<int>("rawResult",rawResult);
resultArray->Add(status);
}
TString altroConf = fConfEnv->GetValue("AltroConf","ON");
altroConf.ToUpper();
if (altroConf != "OFF" ) {
- UInt_t altroResult = ExtractAltro(AliShuttleInterface::kDCS);
- result+=altroResult;
+ UInt_t altroResult = ExtractAltro(AliShuttleInterface::kDCS,dcsAliasMap);
+ if (altroConf != "TRY" ) result+=altroResult;
status = new TParameter<int>("altroResult",altroResult);
resultArray->Add(status);
}
ceSource[1] = AliShuttleInterface::kDAQ;
}
if (source == "DAQHLT" ) numSources=2;
+ if (source == "TRY" ) numSources=2;
UInt_t ceResult=0;
for (Int_t i=0; i<numSources; i++ ) {
ceResult = ExtractCE(ceSource[i]);
// only flag error if CE result is missing from LASER runs
// -- for PHYSICS run do CE processing if data available
- if ( runType == kLaserRunType ) result += ceResult;
+ if ( runType == kLaserRunType && source != "TRY" ) result += ceResult;
status = new TParameter<int>("ceResult",ceResult);
resultArray->Add(status);
qaSource[1] = AliShuttleInterface::kDAQ;
}
if (source == "DAQHLT" ) numSources=2;
+ if (source == "TRY" ) numSources=2;
UInt_t qaResult=0;
for (Int_t i=0; i<numSources; i++ ) {
qaResult = ExtractQA(qaSource[i]);
}
}
- if (errorHandling == "OFF" ) {
- AliCDBMetaData metaData;
- metaData.SetBeamPeriod(0);
- metaData.SetResponsible("Haavard Helstrup");
- metaData.SetAliRootVersion(ALIROOT_SVN_BRANCH);
- metaData.SetComment("Preprocessor AliTPC status.");
- Store("Calib", "PreprocStatus", resultArray, &metaData, 0, kFALSE);
- resultArray->Delete();
- delete resultArray;
- return 0;
- } else {
- delete resultArray;
- return result;
- }
+// Store component status to OCDB
+
+ AliCDBMetaData metaData;
+ metaData.SetBeamPeriod(0);
+ metaData.SetResponsible("Haavard Helstrup");
+ metaData.SetAliRootVersion(ALIROOT_SVN_BRANCH);
+ metaData.SetComment("Preprocessor AliTPC status.");
+ Store("Calib", "PreprocStatus", resultArray, &metaData, 0, kFALSE);
+ resultArray->Delete();
+ delete resultArray;
+
+ if (errorHandling == "OFF" ) return 0;
+ return result;
+
}
//______________________________________________________________________________________________
UInt_t AliTPCPreprocessor::MapTemperature(TMap* dcsAliasMap)
fPressure->MakeSplineFit(map);
Double_t fitFraction = 1.0*fPressure->NumFits()/fPressure->NumSensors();
if (fitFraction > kFitFraction ) {
- AliInfo(Form("Temperature values extracted, fits performed.\n"));
+ AliInfo(Form("Pressure values extracted, fits performed.\n"));
} else {
Log ("Too few pressure maps fitted. \n");
result = 9;
UInt_t result=0;
TMap *map = fHighVoltage->ExtractDCS(dcsAliasMap);
if (map) {
- fHighVoltage->MakeSplineFit(map, kTRUE); // keep both spline fits and original maps
- Double_t fitFraction = 1.0*fHighVoltage->NumFits()/fHighVoltage->NumSensors();
- if (fitFraction > kFitFraction ) {
- AliInfo(Form("High voltage recordings extracted, fits performed.\n"));
- } else {
- Log ("Too few high voltage recordings fitted. \n");
- result = 9;
- }
+ fHighVoltage->ClearFit();
+ fHighVoltage->SetGraph(map);
} else {
Log("No high voltage recordings extracted. \n");
result=9;
// Temperature maps
if (fTemp) {
- fTemp->SetNameTitle("TempMap","TempMap");
- ceObjects->Add(fTemp);
+ AliTPCSensorTempArray *tempMap = new AliTPCSensorTempArray(*fTemp);
+ tempMap->SetNameTitle("TempMap","TempMap");
+ ceObjects->Add(tempMap);
}
// Pressure maps
if (fPressure) {
- AliDCSSensor *sensor=0;
+ AliDCSSensor *sensor=0, *sensorCopy=0;
for (Int_t isensor=0; isensor<kNumPressureSensors; ++isensor ) {
sensor = fPressure->GetSensor(kPressureSensorNames[isensor]);
- sensor->SetNameTitle(kPressureSensorNames[isensor],kPressureSensorNames[isensor]);
- ceObjects->Add(sensor);
+ if (sensor) {
+ sensorCopy = new AliDCSSensor(*sensor);
+ sensorCopy->SetNameTitle(kPressureSensorNames[isensor],kPressureSensorNames[isensor]);
+ ceObjects->Add(sensorCopy);
+ }
}
}
//______________________________________________________________________________________________
-UInt_t AliTPCPreprocessor::ExtractAltro(Int_t sourceFXS)
+UInt_t AliTPCPreprocessor::ExtractAltro(Int_t sourceFXS, TMap* dcsMap)
{
//
- // Read pulser calibration file from file exchage server
+ // Read Altro configuration file from file exchage server
// Keep original entry from OCDB in case no new pulser calibration is available
//
TObjArray *altroObjects=0;
Int_t nSectors = fROC->GetNSectors();
Bool_t changed=false;
+ if (altroObjects == 0 ) altroObjects = new TObjArray;
+
+// extract list of active DDLs
+
+ Bool_t found;
+ TString arrDDL(kNumDDL);
+ arrDDL.Append('0',kNumDDL);
+ for ( Int_t iDDL = 0; iDDL<kNumDDL; iDDL++ ) {
+ TString stringID = Form (kAmandaDDL.Data(),iDDL+kFirstDDL);
+ TPair *pair = (TPair*)dcsMap->FindObject(stringID.Data());
+ found = false;
+ if ( pair ) {
+ TObjArray *valueSet=(TObjArray*)pair->Value();
+ if ( valueSet) {
+ AliDCSValue *val = (AliDCSValue*)valueSet->At(0);
+ if (val) found = val->GetBool();
+ }
+ }
+ if (found){
+ arrDDL[iDDL] = '1';
+ } else {
+ arrDDL[iDDL] = '0';
+ }
+ }
+ TObjString *ddlArray = new TObjString;
+ ddlArray->SetString(arrDDL);
+ TMap *activeDDL = new TMap;
+ activeDDL->SetName("DDLArray");
+ TObjString *key = new TObjString("DDLArray");
+ activeDDL->Add(key,ddlArray);
+ altroObjects->Add(activeDDL);
+ changed=true;
+
+
+// extract Altro configuration files
+
for ( Int_t id=0; id<2; id++) {
TList* list = GetFileSources(sourceFXS,idFXS[id].Data());
if (list && list->GetEntries()>0) {
- if (altroObjects == 0 ) altroObjects = new TObjArray;
// loop through all files from LDCs
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff