Adding AliTPCClusterParam to the calibration database (Marian)

diff --git a/TPC/AliTPCClusterParam.cxx b/TPC/AliTPCClusterParam.cxx
index fb75d69c8c6b5c89e36014fd048de263f9ddb3a6..2ac8f5db36610c2de308535e1eeff058aa596a08 100644 (file)
--- a/TPC/AliTPCClusterParam.cxx
+++ b/TPC/AliTPCClusterParam.cxx
@@ -47,11 +47,20 @@
 //          The angular and diffusion effect is scaling with pad length
 //          common parameterization for different pad length
 //
 //          The angular and diffusion effect is scaling with pad length
 //          common parameterization for different pad length
 //

+//  2. Error parameterization using charge 
+//     2.a) GetErrorQ
+//          GetError0+
+//          adding 1/Q component to diffusion and angluar part
+//     2.b) GetErrorQPar
+//          GetError0Par+
+//          adding 1/Q component to diffusion and angluar part
+//     2.c) GetErrorQParScaled - Just for study
+//          One parameterization for all pad shapes
+//          Smaller precission as previous one

 //
 //

-//     1.d) GetErrorQ
-//     1.e) GetErrorQPar
-//     1.f) GetErrorQParScaled
-//                                                                           //
+//
+//
+                                                                 //

 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include "AliTPCClusterParam.h"
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include "AliTPCClusterParam.h"

diff --git a/TPC/AliTPCcalibDB.cxx b/TPC/AliTPCcalibDB.cxx
index f1c32dabf31a11062c28d2ebd1e55e21005a8413..eef7cb91f897fb6bfc43fcf5ef2d65514a59e131 100644 (file)
--- a/TPC/AliTPCcalibDB.cxx
+++ b/TPC/AliTPCcalibDB.cxx
@@ -21,7 +21,6 @@
 // Request an instance with AliTPCcalibDB::Instance()                        //
 // If a new event is processed set the event number with SetRun              //
 // Then request the calibration data                                         ////
 // Request an instance with AliTPCcalibDB::Instance()                        //
 // If a new event is processed set the event number with SetRun              //
 // Then request the calibration data                                         ////

-

 //
 //
 // Calibration data:
 //
 //
 // Calibration data:


@@ -71,6 +70,9 @@
 //                  
 //                  in AliTPCtransform::Correct() - called calib->GetExB()->Correct(dxyz0,dxyz1)
 //
 //                  
 //                  in AliTPCtransform::Correct() - called calib->GetExB()->Correct(dxyz0,dxyz1)
 //

+//  3.)   cluster error, shape and Q parameterization
+//
+//

 //
 ///////////////////////////////////////////////////////////////////////////////
 
 //
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -162,7 +164,8 @@ AliTPCcalibDB::AliTPCcalibDB():
   fPedestals(0),
   fTemperature(0),
   fMapping(0),
   fPedestals(0),
   fTemperature(0),
   fMapping(0),

-  fParam(0)
+  fParam(0),
+  fClusterParam(0)

 {
   //
   // constructor
 {
   //
   // constructor


@@ -269,6 +272,13 @@ void AliTPCcalibDB::Update(){
     fParam = (AliTPCParam*)(entry->GetObject()->Clone());
   }
 
     fParam = (AliTPCParam*)(entry->GetObject()->Clone());
   }
 

+  entry          = GetCDBEntry("TPC/Calib/ClusterParam");
+  if (entry){
+    //if (fPadNoise) delete fPadNoise;
+    entry->SetOwner(kTRUE);
+    fClusterParam = (AliTPCClusterParam*)(entry->GetObject()->Clone());
+  }
+

   entry          = GetCDBEntry("TPC/Calib/Mapping");
   if (entry){
     //if (fPadNoise) delete fPadNoise;
   entry          = GetCDBEntry("TPC/Calib/Mapping");
   if (entry){
     //if (fPadNoise) delete fPadNoise;

diff --git a/TPC/AliTPCcalibDB.h b/TPC/AliTPCcalibDB.h
index 4362ac9f759b26880588220f2126ccce3811ff2a..c960e0e83e98122766ebac0ea14df334e1bbb78b 100644 (file)
--- a/TPC/AliTPCcalibDB.h
+++ b/TPC/AliTPCcalibDB.h
@@ -19,6 +19,7 @@ class AliDCSSensorArray;
 class AliCDBEntry;
 class AliTPCParam;
 class AliTPCAltroMapping;
 class AliCDBEntry;
 class AliTPCParam;
 class AliTPCAltroMapping;

+class AliTPCClusterParam;

 //class AliCDBStorage;
 
 class AliTPCcalibDB : public TObject
 //class AliCDBStorage;
 
 class AliTPCcalibDB : public TObject


@@ -39,6 +40,7 @@ class AliTPCcalibDB : public TObject
   AliTPCSensorTempArray* GetTemperature() {return fTemperature;}
   AliTPCParam*  GetParameters(){return fParam;}
   AliTPCAltroMapping ** GetMapping(){ return fMapping;}
   AliTPCSensorTempArray* GetTemperature() {return fTemperature;}
   AliTPCParam*  GetParameters(){return fParam;}
   AliTPCAltroMapping ** GetMapping(){ return fMapping;}

+  AliTPCClusterParam *GetClusterParam(){ return fClusterParam;}

   //
   static void     CreateObjectList(const Char_t *filename, TObjArray *calibObjects);
   static void MakeTree(const char * fileName, TObjArray * array, const char * mapFileName = 0, AliTPCCalPad* outlierPad = 0, Float_t ltmFraction = 0.9);
   //
   static void     CreateObjectList(const Char_t *filename, TObjArray *calibObjects);
   static void MakeTree(const char * fileName, TObjArray * array, const char * mapFileName = 0, AliTPCCalPad* outlierPad = 0, Float_t ltmFraction = 0.9);


@@ -63,6 +65,7 @@ protected:
   //
   //
   AliTPCParam * fParam;           // TPC parameters
   //
   //
   AliTPCParam * fParam;           // TPC parameters

+  AliTPCClusterParam * fClusterParam;  // TPC cluster error, shape and Q parameterization

   //
   static AliTPCcalibDB* fgInstance;  // singleton control
   static Bool_t       fgTerminated;  // termination control 
   //
   static AliTPCcalibDB* fgInstance;  // singleton control
   static Bool_t       fgTerminated;  // termination control