Coding conventions fixed.
authordibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Mar 2008 12:02:41 +0000 (12:02 +0000)
committerdibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Mar 2008 12:02:41 +0000 (12:02 +0000)
15 files changed:
HMPID/AliHMPIDCalib.h
HMPID/AliHMPIDParam.h
HMPID/AliHMPIDPreprocessor.h
HMPID/AliHMPIDQADataMakerRec.cxx
HMPID/AliHMPIDQADataMakerSim.cxx
HMPID/AliHMPIDRawStream.h
HMPID/AliHMPIDRecon.cxx
HMPID/AliHMPIDRecon.h
HMPID/AliHMPIDReconHTA.cxx
HMPID/AliHMPIDv0.cxx
HMPID/AliHMPIDv0.h
HMPID/AliHMPIDv1.cxx
HMPID/AliHMPIDv1.h
HMPID/AliHMPIDv2.cxx
HMPID/AliHMPIDv3.cxx

index d47b025..5a50fee 100644 (file)
 //#include <TTree.h>
 #include <TH1.h>
 #include <TH2.h>
-#include <TH1S.h>
+//#include <TH1S.h>
 #include <TMath.h>
 #include <TFile.h>
 #include "AliHMPIDParam.h"
 #include "AliHMPIDRawStream.h"
 
-class TH1I;
 class TFile;
 class AliHMPIDCalib: public TObject { 
 
index 0b7bb8b..1cc5404 100644 (file)
@@ -19,12 +19,7 @@ class AliHMPIDParam :public TNamed
 {
 public:
 //ctor&dtor    
-  virtual        ~AliHMPIDParam() {
-    if (fgInstance){
-      for(Int_t i=0;i<7;i++){ delete fM[i]; fM[i] = 0x0;}
-      fgInstance=0;
-    }
-  }
+  virtual        ~AliHMPIDParam() {if (fgInstance){for(Int_t i=0;i<7;i++){delete fM[i];fM[i] = 0x0;};fgInstance=0;}}
   
   void     Print(Option_t *opt="") const;                                         //print current parametrization
          
index 9eaa263..58a9394 100644 (file)
@@ -4,8 +4,10 @@
 #include <AliPreprocessor.h> //base class
 
 //.
+//.
 //HMPID Preprocessor base class 
 //.
+//.
 class TMap;
 
 class AliHMPIDPreprocessor : public AliPreprocessor
index f275e30..57c93a1 100644 (file)
@@ -38,7 +38,7 @@
 #include "AliHMPIDRawStream.h"
 #include "AliLog.h"
 
-//
+//.
 // HMPID AliHMPIDQADataMakerRec base class
 // for QA of reconstruction
 // here also errors are calculated
index dc2fbf7..752d313 100644 (file)
@@ -38,7 +38,7 @@
 #include "AliHMPIDRawStream.h"
 #include "AliLog.h"
 
-//
+//.
 // HMPID AliHMPIDQADataMakerSim base class
 // for QA of simulation
 // here also errors are calculated
index 9346440..e271090 100644 (file)
@@ -13,7 +13,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TObject.h>
-#include <TRandom.h>
 #include "AliHMPIDParam.h"
 #include <AliBitPacking.h>
 #include <AliFstream.h>
@@ -34,7 +33,6 @@ class AliHMPIDRawStream: public TObject {
             void     InitVars(Int_t n);
             void     DelVars();
     
-           Int_t GetDDLNumber()  const { return fDDLNumber; }                                                                          // Provide current DDL number
    static  inline Int_t GetPad(Int_t ddl,Int_t row,Int_t dil,Int_t pad);                                                                 //get absolute pad number
    static  Int_t GetNDDL()     { return kNDDL;}                                 //return the number of max # of DDLs
    static  Int_t GetNErrors()  { return kSumErr;}                               //return the number of max # of Error Types
@@ -50,11 +48,11 @@ class AliHMPIDRawStream: public TObject {
 
     static inline  Char_t* GetErrName(Int_t eType);      
     inline  Bool_t SetZeroSup (Bool_t isSup);
-    inline  Bool_t GetZeroSup(); 
-    inline  Int_t  GetErrors(Int_t ddl,Int_t eType);                                                                                   //Get errors and occurance
-    Int_t  GetDDLNumber() { return fDDLNumber;} //return the number of DDL actually being decoded
-    UInt_t GetLDCNumber() { return fLDCNumber;} //return the number of LDC actually being decoded
-    UInt_t GetTimeStamp() { return fTimeStamp;} //return the time stamp of the event actually being decoded
+    inline  Bool_t GetZeroSup()const; 
+    inline  Int_t  GetErrors(Int_t ddl,Int_t eType)const;                                                                                   //Get errors and occurance
+    Int_t  GetDDLNumber() const{ return fDDLNumber;} //return the number of DDL actually being decoded
+    UInt_t GetLDCNumber() const{ return fLDCNumber;} //return the number of LDC actually being decoded
+    UInt_t GetTimeStamp() const{ return fTimeStamp;} //return the time stamp of the event actually being decoded
 
   
         
@@ -266,7 +264,7 @@ Bool_t AliHMPIDRawStream::SetZeroSup (Bool_t isSup)
   return fZeroSup;
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++     
-Bool_t AliHMPIDRawStream::GetZeroSup()
+Bool_t AliHMPIDRawStream::GetZeroSup()const
 {
   if(fZeroSup==kTRUE) return kTRUE;
   else                return kFALSE;
@@ -365,7 +363,7 @@ void AliHMPIDRawStream::WriteRaw(TObjArray *pDigAll)
   }//chambers loop
 }//WriteRaw()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Int_t AliHMPIDRawStream::GetErrors(Int_t ddl,Int_t eType)
+Int_t AliHMPIDRawStream::GetErrors(Int_t ddl,Int_t eType)const
 {
 // Return the number of errors for a given error tye during raw data reading
 // Arguments: errorType
index 0f3257c..0432e29 100644 (file)
@@ -66,7 +66,7 @@ void AliHMPIDRecon::InitVars(Int_t n)
 //
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-void AliHMPIDRecon::DeleteVars()
+void AliHMPIDRecon::DeleteVars()const
 {
 //..
 //Delete variables
index 185d634..6316e4d 100644 (file)
@@ -27,7 +27,7 @@ public :
     virtual ~AliHMPIDRecon() {;} //dtor
 
   void     InitVars     (Int_t n);                                                                 //init space for variables
-  void     DeleteVars   ();                                                                        //delete variables
+  void     DeleteVars   ()const;                                                                        //delete variables
   void     CkovAngle    (AliESDtrack *pTrk,TClonesArray *pCluLst,Double_t nmean, Double_t qthre);  //reconstructed Theta Cerenkov
   Bool_t   FindPhotCkov (Double_t cluX,Double_t cluY,Double_t &thetaCer,Double_t &phiCer    );     //find ckov angle for single photon candidate
   Double_t FindRingCkov (Int_t iNclus                                                       );     //best ckov for ring formed by found photon candidates
@@ -41,11 +41,11 @@ public :
   TVector2 TraceForward (TVector3 dirCkov                                                   )const;//tracing forward a photon from (x,y) to PC
   void     Lors2Trs     (TVector3 dirCkov,Double_t &thetaCer,Double_t &phiCer               )const;//LORS to TRS 
   void     Trs2Lors     (TVector3 dirCkov,Double_t &thetaCer,Double_t &phiCer               )const;//TRS to LORS
-  TVector2 GetMip       (                                                                   ) 
+  TVector2 GetMip       (                                                                   )const 
                         {return fMipPos;}                                                          //mip coordinates
-  Double_t GetRingArea  (                                                                   )
+  Double_t GetRingArea  (                                                                   )const
                         {return fRingArea;}                                                        //area of the current ring in cm^2 
-  Double_t GetRingAcc   (                                                                   )
+  Double_t GetRingAcc   (                                                                   )const
                         {return fRingAcc;}                                                         //portion of the ring ([0,1]) accepted by geometry.To scale n. of photons 
   void     SetTrack     (Double_t xRad,Double_t yRad,Double_t theta,Double_t phi            )
                                 {fTrkDir.SetMagThetaPhi(1,theta,phi);  fTrkPos.Set(xRad,yRad);}    //set track parameter at RAD
index f2b4e4c..9fc813b 100644 (file)
@@ -587,6 +587,11 @@ void AliHMPIDReconHTA::InitDatabase()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDReconHTA::FillZeroChan(TH2I *deconv)const
 {
+  //If fills eventually channel without entries
+  //inthe histo "database" jyst interpolating the neighboring cells
+  // Arguments: histogram pointer of the database
+  //   Returns: none
+  //
   Int_t nbinx = deconv->GetNbinsX();
   Int_t nbiny = deconv->GetNbinsY();
   for(Int_t i = 0;i<nbinx;i++) {
index 8fb2ea1..784e56e 100644 (file)
@@ -15,8 +15,6 @@
 
 #include "AliHMPIDv0.h"
 
-#include <TGeoManager.h>
-
 ClassImp(AliHMPIDv0)
 
 void AliHMPIDv0::StepManager()
index 0ac9732..a8cbd7a 100644 (file)
@@ -8,6 +8,8 @@
 //.
 #include "AliHMPID.h"
 
+class TGeoManager;
+
 class AliHMPIDv0 : public AliHMPID 
 {    
 public:
index 7e6823d..0afc726 100644 (file)
@@ -28,7 +28,7 @@
 #include <AliMC.h>            //StepManager()      
 #include <AliRun.h>           //CreateMaterials()    
 #include <AliMagF.h>          //CreateMaterials()
-#include <TGeoManager.h>      //CreateGeometry()
+//#include <TGeoManager.h>      //CreateGeometry()
 #include <TF1.h>              //DefineOpticalProperties()
 #include <TF2.h>              //DefineOpticalProperties()
 #include <TLorentzVector.h>   //IsLostByFresnel() 
index 236920f..018e9e4 100644 (file)
@@ -9,6 +9,8 @@
 #include "AliHMPID.h"             //base class 
 #include "AliHMPIDDigitizer.h"    //CreateDigitizer()
 
+class TGeoManager;
+
 class AliHMPIDv1 : public AliHMPID //TObject-TNamed-AliModule-AliDetector-AliHMPID-AliHMPIDv0
 {
 public:
index 113c7fa..974e510 100644 (file)
@@ -29,7 +29,6 @@
 #include <AliMC.h>            //StepManager()      
 #include <AliRun.h>           //CreateMaterials()    
 #include <AliMagF.h>          //CreateMaterials()
-#include <TGeoManager.h>      //CreateGeometry()
 #include <TF1.h>              //DefineOpticalProperties()
 #include <TF2.h>              //DefineOpticalProperties()
 #include <TLorentzVector.h>   //IsLostByFresnel() 
index cac91dc..302b281 100644 (file)
@@ -29,7 +29,6 @@
 #include <AliMC.h>              //StepManager()      
 #include <AliRun.h>             //CreateMaterials()    
 #include <AliMagF.h>            //CreateMaterials()
-#include <TGeoManager.h>        //CreateGeometry()
 #include <TF1.h>                //DefineOpticalProperties()
 #include <TF2.h>                //DefineOpticalProperties()
 #include <TLorentzVector.h>     //IsLostByFresnel()