OldRCUFormat is set via AliPHOSRecoParam
authorkharlov <kharlov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Dec 2007 21:24:14 +0000 (21:24 +0000)
committerkharlov <kharlov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Dec 2007 21:24:14 +0000 (21:24 +0000)
PHOS/AliPHOSQADataMaker.cxx
PHOS/AliPHOSRecoParam.cxx
PHOS/AliPHOSRecoParam.h

index e09d466..2b554a9 100644 (file)
@@ -315,7 +315,7 @@ void AliPHOSQADataMaker::MakeRaws(AliRawReader* rawReader)
   const Int_t modMax = 5 ; 
   rawReader->Reset() ; 
   AliPHOSRawDecoder decoder(rawReader);
-  decoder.SetOldRCUFormat(kFALSE);
+  decoder.SetOldRCUFormat  (AliPHOSReconstructor::GetRecoParamEmc()->IsOldRCUFormat());
   decoder.SubtractPedestals(AliPHOSReconstructor::GetRecoParamEmc()->SubtractPedestals());
   Int_t count = 0 ; 
   while (decoder.NextDigit()) {
index 3862fe7..284397a 100644 (file)
 ClassImp(AliPHOSRecoParam)
 
 //-----------------------------------------------------------------------------
-AliPHOSRecoParam::AliPHOSRecoParam() : TNamed(),
-  fClusteringThreshold(9999),fLocMaxCut(9999),fMinE(9999),fW0(9999),
-  fSubtractPedestals(kTRUE),fDecoderVersion("")
+AliPHOSRecoParam::AliPHOSRecoParam() :
+  TNamed(),
+  fClusteringThreshold(9999),
+  fLocMaxCut(9999),
+  fMinE(9999),
+  fW0(9999),
+  fSubtractPedestals(kTRUE),
+  fUnfold(kTRUE),
+  fOldRCUFormat(kFALSE),
+  fDecoderVersion("")
 {
   //Default constructor.
 }
 
 //-----------------------------------------------------------------------------
 AliPHOSRecoParam::AliPHOSRecoParam(const AliPHOSRecoParam& recoParam):
-  TNamed(recoParam),fClusteringThreshold(recoParam.fClusteringThreshold),
-  fLocMaxCut(recoParam.fLocMaxCut),fMinE(recoParam.fMinE),fW0(recoParam.fW0),
-  fSubtractPedestals(recoParam.fSubtractPedestals),fDecoderVersion(recoParam.fDecoderVersion)
+  TNamed(),
+  fClusteringThreshold(9999),
+  fLocMaxCut(9999),
+  fMinE(9999),
+  fW0(9999),
+  fSubtractPedestals(kTRUE),
+  fUnfold(kTRUE),
+  fOldRCUFormat(kFALSE),
+  fDecoderVersion("")
 {
   //Copy constructor.
 }
@@ -48,11 +61,13 @@ AliPHOSRecoParam& AliPHOSRecoParam::operator = (const AliPHOSRecoParam& recoPara
 
   if(this != &recoParam) {
     fClusteringThreshold = recoParam.fClusteringThreshold;
-    fLocMaxCut = recoParam.fLocMaxCut;
-    fMinE = recoParam.fMinE;
-    fW0 = recoParam.fW0;
-    fSubtractPedestals = recoParam.fSubtractPedestals;
-    fDecoderVersion=recoParam.fDecoderVersion ;
+    fLocMaxCut           = recoParam.fLocMaxCut;
+    fMinE                = recoParam.fMinE;
+    fW0                  = recoParam.fW0;
+    fSubtractPedestals   = recoParam.fSubtractPedestals;
+    fUnfold              = recoParam.fUnfold;
+    fOldRCUFormat        = recoParam.fOldRCUFormat;
+    fDecoderVersion      = recoParam.fDecoderVersion ;
   }
 
   return *this;
index dbe055f..0b14d42 100644 (file)
@@ -20,21 +20,23 @@ public:
   AliPHOSRecoParam& operator = (const AliPHOSRecoParam& recoParam);
   virtual ~AliPHOSRecoParam() {}
 
-  Float_t GetClusteringThreshold() const { return fClusteringThreshold; }
-  Float_t GetLocalMaxCut() const { return fLocMaxCut;}
-  Float_t GetMinE() const { return fMinE; }
-  Float_t GetLogWeight() const { return fW0; }
-  Bool_t  SubtractPedestals() const { return fSubtractPedestals; }
-  Bool_t  ToUnfold() const { return fUnfold; }
-  const char* DecoderVersion()const{ return fDecoderVersion.Data() ; }
-
-  void SetClusteringThreshold(Float_t cluth) { fClusteringThreshold=cluth; }
-  void SetLocalMaxCut(Float_t cut) { fLocMaxCut=cut;}
-  void SetMinE(Float_t minE) { fMinE=minE; }
-  void SetLogWeight(Float_t w) { fW0=w; }
-  void SetSubtractPedestals(Bool_t subtract) { fSubtractPedestals=subtract; } 
-  void SetDecoderVersion(const char* version="v1"){fDecoderVersion=version ;}
-  void SetUnfolding(Bool_t toUnfold=kFALSE){fUnfold=toUnfold ;}
+  Float_t GetClusteringThreshold() const { return fClusteringThreshold;  }
+  Float_t GetLocalMaxCut()         const { return fLocMaxCut;            }
+  Float_t GetMinE()                const { return fMinE;                 }
+  Float_t GetLogWeight()           const { return fW0;                   }
+  Bool_t  SubtractPedestals()      const { return fSubtractPedestals;    }
+  Bool_t  ToUnfold()               const { return fUnfold;               }
+  Bool_t  IsOldRCUFormat()         const { return fOldRCUFormat;         }
+  const char* DecoderVersion()     const { return fDecoderVersion.Data();}
+
+  void SetClusteringThreshold(Float_t cluth)      { fClusteringThreshold=cluth;   }
+  void SetLocalMaxCut(Float_t cut)                { fLocMaxCut          =cut;     }
+  void SetMinE(Float_t minE)                      { fMinE               =minE;    }
+  void SetLogWeight(Float_t w)                    { fW0                 =w;       }
+  void SetSubtractPedestals(Bool_t subtract)      { fSubtractPedestals  =subtract;} 
+  void SetDecoderVersion(const char* version="v1"){fDecoderVersion      =version ;}
+  void SetUnfolding(Bool_t toUnfold=kFALSE)       {fUnfold              =toUnfold;}
+  void SetOldRCUFormat(Bool_t oldRCU = kTRUE)     {fOldRCUFormat        =oldRCU;  }
 
 protected:
 
@@ -44,9 +46,10 @@ protected:
   Float_t fW0;
   Bool_t  fSubtractPedestals;
   Bool_t  fUnfold;
+  Bool_t  fOldRCUFormat; // kTRUE if RCU has old firmware (2006-2007)
   TString fDecoderVersion ;
 
-  ClassDef(AliPHOSRecoParam,1)
+  ClassDef(AliPHOSRecoParam,2)
 };
 
 #endif