Updates to ease generating TPC/Config/Temperature OCDB entries

diff --git a/TPC/AliTPCGenDBTemp.cxx b/TPC/AliTPCGenDBTemp.cxx
index f4c153eb18a19bc25865db0110d28d2c966236a6..27a27a79333e218feb8a2506dec0c2b6173d95ee 100644 (file)
--- a/TPC/AliTPCGenDBTemp.cxx
+++ b/TPC/AliTPCGenDBTemp.cxx
@@ -1,5 +1,4 @@
 
-// .L /afs/cern.ch/user/h/haavard/alice/tpc/temperature/AliTPCGenDBTemp.C+
 // TTimeStamp startTime(2006,10,18,0,0,0,0,kFALSE)
 // TTimeStamp endTime(2006,10,19,0,0,0,0,kFALSE)
 // Int_t run=2546
@@ -7,6 +6,18 @@
 // db->Init(run,"TPC/Config/Temperature","TPC/*/*")
 // db->MakeCalib("TempSensor.txt","DCSMap.root",startTime,endTime,run)
 
+//  Data base entry generation:
+  
+//  AliTPCGenDBTemp db
+//  db->SetDefaultStorage("local://$ALICE_ROOT");
+//  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")
+
+  
+
+
+
 
 #include "AliTPCGenDBTemp.h"
 #include "AliLog.h"
@@ -50,7 +61,7 @@ AliTPCGenDBTemp::~AliTPCGenDBTemp(){
 
 }
 //______________________________________________________________________________________________
-AliTPCGenDBTemp& AliTPCGenDBTemp::operator= (const AliTPCGenDBTemp& org )
+AliTPCGenDBTemp& AliTPCGenDBTemp::operator= (const AliTPCGenDBTemp&  )
 {
  //
  // assignment operator
@@ -92,27 +103,56 @@ void AliTPCGenDBTemp::MakeCalib(const char *fList, const char *fMap,
 
 //______________________________________________________________________________________________
 
-TClonesArray * AliTPCGenDBTemp::ReadList(const char *fname) {
+TClonesArray * AliTPCGenDBTemp::ReadList(const char *fname, const char *title,
+                       const TString& amandaString) {
   //
   // read values from ascii file
   //
-  TTree* tree = new TTree("tempConf","tempConf");
+  TTree* tree = new TTree(title,title);
   tree->ReadFile(fname,"");
-  TClonesArray *arr = AliTPCSensorTemp::ReadTree(tree);
+  TClonesArray *arr;
+  if ( amandaString.Length()== 0 ) {
+    arr = AliTPCSensorTemp::ReadTree(tree);
+  } else {
+    arr = AliTPCSensorTemp::ReadTree(tree,amandaString);
+  }
   delete tree;
   return arr;
 }
 
 //______________________________________________________________________________________________
 
-TTree * AliTPCGenDBTemp::ReadListTree(const char *fname) {
+TTree * AliTPCGenDBTemp::ReadListTree(const char *fname, const char *title,
+                         const TString& amandaString) {
   //
   // read values from ascii file
   //
-  TTree* tree = new TTree("tempConf","tempConf");
+  TTree* tree = new TTree(title,title);
   tree->ReadFile(fname,"");
-  TClonesArray *arr = AliTPCSensorTemp::ReadTree(tree);
+  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)
+{
+   //
+   // Store Configuration file to OCDB
+   //
+
+   TTree *tree = ReadListTree(file,amandaString);
+   SetConfTree(tree);
+   SetFirstRun(firstRun);
+   SetLastRun(lastRun);
+
+   StoreObject(confDir, fConfTree, fMetaData);
+}
+
+

diff --git a/TPC/AliTPCGenDBTemp.h b/TPC/AliTPCGenDBTemp.h
index 26e6ab83f4c2a74f4cfb0507c1b2899ad64fc999..a5afef292fe4f23ae02b11b2c5cf4f2f92907a47 100644 (file)
--- a/TPC/AliTPCGenDBTemp.h
+++ b/TPC/AliTPCGenDBTemp.h
@@ -17,6 +17,7 @@
 #include "AliLog.h"
 #include "AliDCSGenDB.h"
 
+
 class AliTPCGenDBTemp : public AliDCSGenDB {
 
 public:
@@ -29,14 +30,18 @@ public:
   void            MakeCalib(const char *file, const char *fMap,
                             const TTimeStamp& startTime,
                            const TTimeStamp& endTime, Int_t run);
+  void            MakeConfig(const char *file, Int_t firstRun, Int_t lastRun, 
+                            const char *confDir, const TString& amandaString=0);
 
 // functionality
 
-  static TClonesArray *  ReadList(const char* fname);
-  static TTree        *  ReadListTree(const char* fname);
+  static TClonesArray* ReadList(const char* fname, const char *title="tempConf", 
+                                 const TString& amandaString=0);
+  static TTree*   ReadListTree(const char* fname, const char *title="tempConf",
+                                 const TString& amandaString=0);
 
 // getters/setters
-
+ 
 
 private:
   AliTPCGenDBTemp(const AliTPCGenDBTemp& org);

diff --git a/TPC/AliTPCSensorTemp.cxx b/TPC/AliTPCSensorTemp.cxx
index 63c5f7a0c9452493645ff1ae996367d65f353f8d..571d391c8a4d81e5a1abe107ddbc8495600dceaf 100644 (file)
--- a/TPC/AliTPCSensorTemp.cxx
+++ b/TPC/AliTPCSensorTemp.cxx
@@ -23,14 +23,15 @@
 
 // Running instructions:
 /*
-  TClonesArray * arr = AliTPCSensorTemp::ReadList("TempSensor.txt");
+  TClonesArray * arr = AliTPCSensorTemp::ReadList("TempSensor.txt","tpc_PT_%d.Temperature");
   TFile f("TempSensors.root","RECREATE");
   TTree * tree = new TTree("TempSensor", "TempSensor");
   tree->Branch("Temp",&arr);
   tree->Fill();
   tree->Write();
   
- */
+*/
+
 //
 
 
@@ -162,13 +163,14 @@ AliTPCSensorTemp& AliTPCSensorTemp::operator=(const AliTPCSensorTemp& source){
 }
 //______________________________________________________________________________________________
 
-TClonesArray * AliTPCSensorTemp::ReadList(const char *fname) {
+TClonesArray * AliTPCSensorTemp::ReadList(const char *fname,
+                                          const TString& amandaString) {
   //
   // read values from ascii file
   //
   TTree * tree = new TTree("asci","asci");
   tree->ReadFile(fname,"");
-  TClonesArray *arr = ReadTree(tree);
+  TClonesArray *arr = ReadTree(tree, amandaString);
   delete tree;
   return arr;
 }

diff --git a/TPC/AliTPCSensorTemp.h b/TPC/AliTPCSensorTemp.h
index eaff19b3874b040594f99c6a8fc1eb22cc454744..04805ab488f4e96e0bf92e183719689c1bb0475a 100644 (file)
--- a/TPC/AliTPCSensorTemp.h
+++ b/TPC/AliTPCSensorTemp.h
@@ -49,7 +49,8 @@ public:
   void SetNum    (Int_t num)       {fNum    = num;   }
 
 
-  static TClonesArray * ReadList(const char *fname);
+  static TClonesArray * ReadList(const char *fname,
+                                 const TString& amandaString = kAmandaString);
   static TClonesArray * ReadTree(TTree *tree, 
                                  const TString& amandaString = kAmandaString);