Calibration class and Preprocessor updated

[u/mrichter/AliRoot.git] / TRD / AliTRDDBAccess.C

diff --git a/TRD/AliTRDDBAccess.C b/TRD/AliTRDDBAccess.C
index 44362eb96596dc46cfd619d86bfa9c13d216b597..1b58e5af92145e8f4d3c2a9aaec5ea25143d8972 100644 (file)
--- a/TRD/AliTRDDBAccess.C
+++ b/TRD/AliTRDDBAccess.C
@@ -2,10 +2,10 @@
 AliCDBStorage      *storLoc;
 AliCDBStorage      *storGrid;
 AliCDBEntry        *entry     = 0;
-AliTRDCalVdrift    *calobj    = 0;
-AliTRDCalROCVdrift *calobjROC = 0;
+AliTRDCalPad    *calobj    = 0;
+AliTRDCalROC *calobjROC = 0;
 
-void AliTRDDBAccessTRD()
+void AliTRDDBAccess()
 {
 
   // Single instance of AliCDBManager. 
@@ -15,23 +15,24 @@ void AliTRDDBAccessTRD()
   storLoc = man->GetStorage("local://DBLocal");
 
   // Create the new database object
-  AliTRDCalVdrift    *calVdrift    = new AliTRDCalVdrift("Vdrift","TRD drift velocities");
-  AliTRDCalROCVdrift *calROCVdrift = calVdrift->GetCalROCVdrift(0,2,0);
-  calROCVdrift->SetVdrift(1,1,1.50);
-  calROCVdrift->SetVdrift(2,2,1.55);
-  calROCVdrift->SetVdrift(3,3,1.60);
+  AliTRDCalPad    *calVdrift    = new AliTRDCalPad("Vdrift","TRD drift velocities");
+  AliTRDCalROC *calROCVdrift = calVdrift->GetCalROC(0,2,0);
+  calROCVdrift->SetValue(1,1,1.50);
+  calROCVdrift->SetValue(2,2,1.55);
+  calROCVdrift->SetValue(3,3,1.60);
 
   // Id of the object: AliCDBId("name", firstRun, lastRun)
   AliCDBId id1("TRD/Calib/Vdrift",0,10); 
 
   // MetaData describing the object
   AliCDBMetaData *md1= new AliCDBMetaData(); 
-  md1->SetObjectClassName("AliTRDCalVdrift");
+  md1->SetObjectClassName("AliTRDCalPad");
   md1->SetResponsible("Christoph Blume");
   md1->SetBeamPeriod(1);
   md1->SetAliRootVersion("05-04-00"); //root version
-  md1->SetComment("This ist a Vdrift test");
-  md1->SetProperty("key1",calVdrift);
+  md1->SetComment("This is a Vdrift test");
+  TObjString *strVdrift = new TObjString("Drift velocities for 540 chambers");
+  md1->SetProperty("key1",strVdrift);
 
   // Store the object into local storage
   // Filename: DBLocal/TRD/Calib/Vdrift/Run0_10_v0_s0.root
@@ -42,17 +43,17 @@ void AliTRDDBAccessTRD()
   printf("\nTRD :: Retrieve object from local storage...\n");
   entry = storLoc->Get("TRD/Calib/Vdrift",5);
 
-  calobj    = (AliTRDCalVdrift *) entry->GetObject();
-  calobjROC = calobj->GetCalROCVdrift(0,2,0);
+  calobj    = (AliTRDCalPad *) entry->GetObject();
+  calobjROC = calobj->GetCalROC(0,2,0);
   printf("\nTRD :: Drift velocities (1): %f (1,1), %f (2,2), %f (3.3)\n"
-        ,calobjROC->GetVdrift(1,1)
-        ,calobjROC->GetVdrift(2,2)
-        ,calobjROC->GetVdrift(3,3));
+        ,calobjROC->GetValue(1,1)
+        ,calobjROC->GetValue(2,2)
+        ,calobjROC->GetValue(3,3));
 
   // Update object
-  calobjROC->SetVdrift(1,1,1.60);
-  calobjROC->SetVdrift(2,2,1.35);
-  calobjROC->SetVdrift(3,3,1.10);
+  calobjROC->SetValue(1,1,1.60);
+  calobjROC->SetValue(2,2,1.35);
+  calobjROC->SetValue(3,3,1.10);
 
   // Store into local: filename = Run0_10_v0_s1.root
   printf("\nTRD :: Storing object into local storage...\n");
@@ -61,13 +62,15 @@ void AliTRDDBAccessTRD()
   // Read, update, store again
   printf("\nTRD :: Retrieve object from local storage...\n");
   entry = storLoc->Get("TRD/Calib/Vdrift",5);
+  entry = storLoc->Get("TRD/Calib/Vdrift",5);
+  entry = storLoc->Get("TRD/Calib/Vdrift",5);
 
-  calobj    = (AliTRDCalVdrift *) entry->GetObject();
-  calobjROC = calobj->GetCalROCVdrift(0,2,0);
+  calobj    = (AliTRDCalPad *) entry->GetObject();
+  calobjROC = calobj->GetCalROC(0,2,0);
   printf("\nTRD :: Drift velocities (2): %f (1,1), %f (2,2), %f (3.3)\n"
-        ,calobjROC->GetVdrift(1,1)
-        ,calobjROC->GetVdrift(2,2)
-        ,calobjROC->GetVdrift(3,3));
+        ,calobjROC->GetValue(1,1)
+        ,calobjROC->GetValue(2,2)
+        ,calobjROC->GetValue(3,3));
 
   printf("\nTRD :: Activating GRID storage...\n");
   storGrid = 0x0;
@@ -81,6 +84,9 @@ void AliTRDDBAccessTRD()
     storGrid->Put(entry); 
   }
 
+  entry->Dump();
+  cout << entry->IsOwner() << endl;
+  
   AliCDBManager::Instance()->Destroy();
   delete entry;
   delete md1;