// Data base entry generation:
// AliTPCGenDBTemp db
-// db->SetDefaultStorage("local://$ALICE_ROOT");
+// db->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
// db->SetSpecificStorage("local:///afs/cern.ch/alice/tpctest/Calib/");
// db->Init(0,"TPC/Config/Temperature","TPC/*/*")
// db->MakeConfig("TempSensor.txt",0,999999999,"TPC/Config/Temperature")
//______________________________________________________________________________________________
-AliTPCGenDBTemp::AliTPCGenDBTemp(const AliTPCGenDBTemp& org) : AliDCSGenDB(org)
+AliTPCGenDBTemp::AliTPCGenDBTemp(const AliTPCGenDBTemp& ) : AliDCSGenDB()
{
//
void AliTPCGenDBTemp::MakeCalib(const char *fList, const char *fMap,
const TTimeStamp& startTime,
const TTimeStamp& endTime,
- Int_t run )
+ Int_t run, const TString& amandaString )
{
// The Terminate() function is the last function to be called during
// a query. It always runs on the client, it can be used to present
// the results graphically or save the results to file.
- AliTPCSensorTempArray *temperature = new AliTPCSensorTempArray(fList);
+ AliTPCSensorTempArray *temperature=0;
+ if ( amandaString.Length()== 0 ) {
+ temperature = new AliTPCSensorTempArray(fList);
+ } else {
+ temperature = new AliTPCSensorTempArray(fList,amandaString);
+ }
temperature->SetStartTime(startTime);
temperature->SetEndTime(endTime);
temperature->SetValCut(kValCut);
//______________________________________________________________________________________________
-TTree * AliTPCGenDBTemp::ReadListTree(const char *fname, const char *title,
- const TString& amandaString) {
+TTree * AliTPCGenDBTemp::ReadListTree(const char *fname, const char *title) {
//
// read values from ascii file
//
TTree* tree = new TTree(title,title);
tree->ReadFile(fname,"");
- TClonesArray *arr;
- if ( amandaString.Length()== 0 ) {
- arr = AliTPCSensorTemp::ReadTree(tree);
- } else {
- arr = AliTPCSensorTemp::ReadTree(tree,amandaString);
- }
- arr->Delete();
- delete arr;
return tree;
}
+
//______________________________________________________________________________________________
void AliTPCGenDBTemp::MakeConfig(const char *file, Int_t firstRun, Int_t lastRun,
- const char *confDir, const TString& amandaString)
+ const char *confDir)
{
//
// Store Configuration file to OCDB
//
- TTree *tree = ReadListTree(file,"tempConf",amandaString);
+ TTree *tree = ReadListTree(file,"tempConf");
SetConfTree(tree);
SetFirstRun(firstRun);
SetLastRun(lastRun);