Fixing coding violation problems (Haavard)

diff --git a/TPC/AliTPCTransform.cxx b/TPC/AliTPCTransform.cxx
index cd669eaa049c3151004b465d3174d3cf797df241..6c6aaa974c67e237b0b2b4767d2202e1cabaffec 100755 (executable)
--- a/TPC/AliTPCTransform.cxx
+++ b/TPC/AliTPCTransform.cxx
@@ -4,6 +4,7 @@
 #include "AliTPCcalibDB.h"
 #include "AliTPCParam.h"
 #include "TMath.h"
+#include "AliTPCExB.h"
 
 /* To test it:
    cdb=AliCDBManager::Instance()

diff --git a/TPC/AliTPCcalibDB.cxx b/TPC/AliTPCcalibDB.cxx
index 40ba1c81cc0db9a2a0da5d148d98949bf3a80dc3..8fc41180bbd7d0ad80f025d2e448f787376254f7 100644 (file)
--- a/TPC/AliTPCcalibDB.cxx
+++ b/TPC/AliTPCcalibDB.cxx
@@ -24,23 +24,26 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <iostream>
+#include <fstream>
+
 
 #include <AliCDBManager.h>
-#include <AliCDBStorage.h>
 #include <AliCDBEntry.h>
 #include <AliLog.h>
 
 #include "AliTPCcalibDB.h"
+#include "AliTPCExB.h"
 
 #include "AliTPCCalROC.h"
 #include "AliTPCCalPad.h"
-#include "AliTPCCalDet.h"
 #include "AliTPCSensorTempArray.h"
+#include "AliTPCTransform.h"
+class AliCDBStorage;
+class AliTPCCalDet;
 //
 //
 
-#include <iostream>
-#include <fstream>
 #include "TFile.h"
 #include "TKey.h"
 
@@ -99,6 +102,7 @@ void AliTPCcalibDB::Terminate()
 //_____________________________________________________________________________
 AliTPCcalibDB::AliTPCcalibDB():
   fRun(-1),
+  fTrafo(0),
   fExB(0),
   fPadGainFactor(0),
   fPadTime0(0),
@@ -106,9 +110,7 @@ AliTPCcalibDB::AliTPCcalibDB():
   fPadNoise(0),
   fPedestals(0),
   fTemperature(0),
-  fPressure(0),
-  fParam(0),
-  fTrafo(0)
+  fParam(0)
 {
   //
   // constructor
@@ -215,13 +217,6 @@ void AliTPCcalibDB::Update(){
     fTemperature = (AliTPCSensorTempArray*)entry->GetObject();
   }
 
-  entry          = GetCDBEntry("TPC/Calib/Pressure");
-  if (entry){
-    //if (fPressure) delete fPressure;
-    entry->SetOwner(kTRUE);
-    fPressure = (AliDCSSensorArray*)entry->GetObject();
-  }
-
   entry          = GetCDBEntry("TPC/Calib/Parameters");
   if (entry){
     //if (fPadNoise) delete fPadNoise;
@@ -263,6 +258,9 @@ AliTPCcalibDB& AliTPCcalibDB::operator= (const AliTPCcalibDB& rhs)
 
 void AliTPCcalibDB::CreateObjectList(const Char_t *filename, TObjArray *calibObjects)
 {
+//
+// Create calibration objects and read contents from OCDB
+//
    if ( calibObjects == 0x0 ) return;
    ifstream in;
    in.open(filename);
@@ -355,7 +353,7 @@ void AliTPCcalibDB::CreateObjectList(const Char_t *filename, TObjArray *calibObj
 void AliTPCcalibDB::MakeTree(const char * fileName, TObjArray * array, const char * mapFileName, AliTPCCalPad* outlierPad, Float_t ltmFraction) {
   //
   // Write a tree with all available information
-  // im mapFileName is speciefied, the Map information are also written to the tree
+  // if mapFileName is specified, the Map information are also written to the tree
   // pads specified in outlierPad are not used for calculating statistics
   //  - the same function as AliTPCCalPad::MakeTree - 
   //
@@ -380,11 +378,11 @@ void AliTPCcalibDB::MakeTree(const char * fileName, TObjArray * array, const cha
       
       mapNames = new TString[mapEntries];
       for (Int_t ivalue = 0; ivalue < mapEntries; ivalue++) {
-       TString ROCname(((TKey*)(listOfROCs->At(ivalue*2)))->GetName());
-         ROCname.Remove(ROCname.Length()-4, 4);
-         mapIROCs->AddAt((AliTPCCalROC*)mapFile.Get((ROCname + "IROC").Data()), ivalue);
-         mapOROCs->AddAt((AliTPCCalROC*)mapFile.Get((ROCname + "OROC").Data()), ivalue);
-         mapNames[ivalue].Append(ROCname);
+       TString nameROC(((TKey*)(listOfROCs->At(ivalue*2)))->GetName());
+         nameROC.Remove(nameROC.Length()-4, 4);
+         mapIROCs->AddAt((AliTPCCalROC*)mapFile.Get((nameROC + "IROC").Data()), ivalue);
+         mapOROCs->AddAt((AliTPCCalROC*)mapFile.Get((nameROC + "OROC").Data()), ivalue);
+         mapNames[ivalue].Append(nameROC);
       }
       
       for (Int_t ivalue = 0; ivalue < mapEntries; ivalue++) {

diff --git a/TPC/AliTPCcalibDB.h b/TPC/AliTPCcalibDB.h
index e7b7950c77482f93f7f5be1c83fd409bb179e530..6180c0f29ca7f475afc29b459327834f12f4db42 100644 (file)
--- a/TPC/AliTPCcalibDB.h
+++ b/TPC/AliTPCcalibDB.h
@@ -10,8 +10,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-#include "AliTPCTransform.h"
-#include "AliTPCExB.h"
+class AliTPCTransform;
+class AliTPCExB;
 #include "TObject.h"
 class AliTPCCalPad;
 class AliTPCSensorTempArray;
@@ -37,7 +37,6 @@ class AliTPCcalibDB : public TObject
   AliTPCCalPad* GetPadNoise() {return fPadNoise;}
   AliTPCCalPad* GetPedestals() {return fPedestals;}
   AliTPCSensorTempArray* GetTemperature() {return fTemperature;}
-  AliDCSSensorArray* GetPressure() {return fPressure;}
   AliTPCParam*  GetParameters(){return fParam;}
   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);
@@ -47,25 +46,25 @@ protected:
   void         Update();  //update entries
   AliCDBEntry* GetCDBEntry(const char* cdbPath);   
   Long64_t        fRun;         // current run number
-  AliTPCTransform *fTrafo; // object responsible for spacial corrections
-  AliTPCExB *fExB;
+  AliTPCTransform *fTrafo;      // object responsible for spacial corrections
+  AliTPCExB *fExB;              // ExB correction factor
 //  AliCDBStorage* fLocator;      // Storage locator retrieved from AliCDBManager
   //
   // calibration parameters per pad
   //
-  AliTPCCalPad* fPadGainFactor;
-  AliTPCCalPad* fPadTime0;
-  AliTPCCalPad* fPadPRFWidth;
-  AliTPCCalPad* fPadNoise;
-  AliTPCCalPad* fPedestals;
-  AliTPCSensorTempArray* fTemperature;
-  AliDCSSensorArray *fPressure;
+  AliTPCCalPad* fPadGainFactor;   // Gain calibration entry
+  AliTPCCalPad* fPadTime0;        // Time0 calibration entry
+  AliTPCCalPad* fPadPRFWidth;     // Pad Response Function width 
+  AliTPCCalPad* fPadNoise;        // Noise calibration entry
+  AliTPCCalPad* fPedestals;       // Pedestal calibration entry
+  AliTPCSensorTempArray* fTemperature; // Temperature calibration entry
+
   //
   //
-  AliTPCParam * fParam;
+  AliTPCParam * fParam;           // TPC parameters
   //
-  static AliTPCcalibDB* fgInstance;
-  static Bool_t       fgTerminated;
+  static AliTPCcalibDB* fgInstance;  // singleton control
+  static Bool_t       fgTerminated;  // termination control 
   ClassDef(AliTPCcalibDB, 0)
  private:
    AliTPCcalibDB (const AliTPCcalibDB& org);