AliHMPIDRecoParam is updated with RunTypes:
authordibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 16 Sep 2009 11:29:51 +0000 (11:29 +0000)
committerdibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 16 Sep 2009 11:29:51 +0000 (11:29 +0000)
LowFlux, HighFlux, Cosmics (calibration is not needed)
and macro to create HMPID recoparams is added.
AliHMPIDTracker and Recon are updated to use the new recoparams.
Relative items in Planning will be closed

HMPID/AliHMPIDRecoParam.cxx
HMPID/AliHMPIDRecoParam.h
HMPID/AliHMPIDReconstructor.cxx
HMPID/AliHMPIDReconstructor.h
HMPID/AliHMPIDTracker.h
HMPID/AliHMPIDtrack.h
HMPID/Hconfig.C

index 9df03a7..6b6a9db 100644 (file)
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 //
-//Email: Levente.Molnar@ba.infn.it
+//Email: domenico.dibari@ba.infn.it
 //
-
+#include "AliLog.h"
 #include "AliHMPIDRecoParam.h"
 #include "AliHMPIDParam.h"
 
 ClassImp(AliHMPIDRecoParam)
 
 //_____________________________________________________________________________
-AliHMPIDRecoParam::AliHMPIDRecoParam():TNamed(),
-  fRecoMode(kTRUE),
-  fUserCutMode(kTRUE)
+AliHMPIDRecoParam::AliHMPIDRecoParam():AliDetectorRecoParam(),   
+  fHmpRecoMode(kTRUE),fHmpFixedDistCut(kTRUE),
+  fHmpTrackMatchingDist(1.0)
 {
   //
   // ctor
   //
-  for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) fUserCut[iCh]=3;
+  for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) fHmpUserCut[iCh]=3;
+  for(Int_t iPol=0;iPol<5;iPol++) fHmpTrackMatchingDistParas[iPol]=0;
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-AliHMPIDRecoParam::AliHMPIDRecoParam(const AliHMPIDRecoParam &p):TNamed(p),
-    fRecoMode(kTRUE),
-    fUserCutMode(kTRUE)
+AliHMPIDRecoParam::AliHMPIDRecoParam(const AliHMPIDRecoParam &p):AliDetectorRecoParam(p),   
+    fHmpRecoMode(kTRUE),fHmpFixedDistCut(kTRUE),
+    fHmpTrackMatchingDist(1.0)
 { 
    //copy Ctor
 
-   fRecoMode= p.fRecoMode;
-   for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) fUserCut[iCh]=p.fUserCut[iCh];
-   fUserCutMode = p.fUserCutMode;
+   fHmpRecoMode= p.fHmpRecoMode;
+   fHmpFixedDistCut=p.fHmpFixedDistCut;
+   for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) fHmpUserCut[iCh]=p.fHmpUserCut[iCh];
+   fHmpTrackMatchingDist=p.fHmpTrackMatchingDist;
+   for(Int_t iPol=0;iPol<5;iPol++) fHmpTrackMatchingDistParas[iPol]=p.fHmpTrackMatchingDistParas[iPol];
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -57,23 +60,101 @@ AliHMPIDRecoParam& AliHMPIDRecoParam::operator=(const AliHMPIDRecoParam &p)
 //
 // assign. operator
 //
-  this->fRecoMode= p.fRecoMode;
-  for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) this->fUserCut[iCh] = p.fUserCut[iCh];       
-  this->fUserCutMode = p.fUserCutMode;       
+  AliDetectorRecoParam::operator=(p);
+  this->fHmpRecoMode= p.fHmpRecoMode;
+  this->fHmpFixedDistCut=p.fHmpFixedDistCut;
+  for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) this->fHmpUserCut[iCh] = p.fHmpUserCut[iCh];   
+  this->fHmpTrackMatchingDist=p.fHmpTrackMatchingDist;
+  for(Int_t iPol=0;iPol<5;iPol++) this->fHmpTrackMatchingDistParas[iPol]=p.fHmpTrackMatchingDistParas[iPol];
   return *this;
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-AliHMPIDRecoParam *AliHMPIDRecoParam::GetUserModeParam(){
+AliHMPIDRecoParam::~AliHMPIDRecoParam() 
+{
+  //
+  // dtor
+  //  
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+AliHMPIDRecoParam *AliHMPIDRecoParam::GetLowFluxParam(){
   //
-  // Provide access to reconstruction parameters fro  the rec.C
+  // Set HMPID Reco Params for Low Flux environment
   //
-  AliHMPIDRecoParam *hmpidRecoParam = new AliHMPIDRecoParam;
-  return hmpidRecoParam;
+  AliHMPIDRecoParam *hmpParam = new AliHMPIDRecoParam;
+  hmpParam->fHmpRecoMode = kTRUE;                                                     //kTRUE = normal reco. kFLASE = HTA
+  hmpParam->fHmpUserCut[0] = 3;                                                       //HMPID Module 0 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[1] = 3;                                                       //HMPID Module 1 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[2] = 3;                                                       //HMPID Module 2 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[3] = 3;                                                       //HMPID Module 3 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[4] = 3;                                                       //HMPID Module 4 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[5] = 3;                                                       //HMPID Module 5 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[6] = 3;                                                       //HMPID Module 6 User DAQ Sigma cut
+  hmpParam->fHmpFixedDistCut=kTRUE;                                                   //HMPID fixed (kTRUE) or parameterized distance cut (kFALSE)
+  hmpParam->fHmpTrackMatchingDist = 3.0;                                              //HMPID Track Matching distance cut
+  for(Int_t iPol=0;iPol<5;iPol++) hmpParam->fHmpTrackMatchingDistParas[iPol]=1;       //Prevision for momentum dependen track matching
+  hmpParam->SetName("HMP Low Flux");
+  hmpParam->SetTitle("HMP Low Flux");
+  return hmpParam;
+    
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-AliHMPIDRecoParam::~AliHMPIDRecoParam() 
+AliHMPIDRecoParam *AliHMPIDRecoParam::GetHighFluxParam(){
+  //
+  // Set HMPID Reco Params for Low Flux environment
+  //
+  AliHMPIDRecoParam *hmpParam = new AliHMPIDRecoParam;
+  hmpParam->fHmpRecoMode = kTRUE;                                                       //kTRUE = normal reco. kFLASE = HTA
+  hmpParam->fHmpUserCut[0] = 3;                                                         //HMPID Module 0 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[1] = 3;                                                         //HMPID Module 1 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[2] = 3;                                                         //HMPID Module 2 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[3] = 3;                                                         //HMPID Module 3 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[4] = 3;                                                         //HMPID Module 4 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[5] = 3;                                                         //HMPID Module 5 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[6] = 3;                                                         //HMPID Module 6 User DAQ Sigma cut
+  hmpParam->fHmpFixedDistCut=kTRUE;                                                     //HMPID fixed (kTRUE) or parameterized distance cut (kFALSE)
+  hmpParam->fHmpTrackMatchingDist = 1.0;                                                //HMPID Track Matching distance cut
+  for(Int_t iPol=0;iPol<5;iPol++) hmpParam->fHmpTrackMatchingDistParas[iPol]=1;         //Prevision for momentum dependen track matching
+  hmpParam->SetName("HMP High Flux");
+  hmpParam->SetTitle("HMP High Flux");
+  return hmpParam;
+    
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+AliHMPIDRecoParam *AliHMPIDRecoParam::GetCosmicParam(){
+  //
+  // Set HMPID Reco Params for Low Flux environment
+  //
+  AliHMPIDRecoParam *hmpParam = new AliHMPIDRecoParam;
+  hmpParam->fHmpRecoMode = kTRUE;                                                                   //kTRUE = normal reco. kFLASE = HTA
+  hmpParam->fHmpUserCut[0] = 3;                                                                     //HMPID Module 0 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[1] = 3;                                                                     //HMPID Module 1 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[2] = 3;                                                                     //HMPID Module 2 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[3] = 3;                                                                     //HMPID Module 3 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[4] = 3;                                                                     //HMPID Module 4 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[5] = 3;                                                                     //HMPID Module 5 User DAQ Sigma cut
+  hmpParam->fHmpUserCut[6] = 3;                                                                     //HMPID Module 6 User DAQ Sigma cut
+  hmpParam->fHmpFixedDistCut=kTRUE;                                                                 //HMPID fixed (kTRUE) or parameterized distance cut (kFALSE)
+  hmpParam->fHmpTrackMatchingDist = 4.0;                                                            //HMPID Track Matching distance cut
+  for(Int_t iPol=0;iPol<5;iPol++) hmpParam->fHmpTrackMatchingDistParas[iPol]=1;                     //Prevision for momentum dependen track matching
+  hmpParam->SetName("HMP Cosmic ");
+  hmpParam->SetTitle("HMP Cosmic");
+  return hmpParam;
+    
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDRecoParam::PrintParameters() const
 {
   //
-  // dtor
-  //  
+  // Printing of the used HMPID reconstruction parameters
+  //
+   AliInfo(Form("%s",AliHMPIDRecoParam::GetName()));
+   AliInfo(Form("IsDefault: %d",AliHMPIDRecoParam::IsDefault()));
+   AliInfo(Form(" Running HMPID Reco: %d (1=Standard, 0=HTA)",fHmpRecoMode));
+   AliInfo(Form(" Is track matching distance fixed (1) or momentum dependent (0): %d",fHmpFixedDistCut));
+   AliInfo(Form(" HMPID track matching distance cut: %.3lf",fHmpTrackMatchingDist));
+   for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++)
+    AliInfo(Form(" HMPID Chamber: %d User DAQ Sigma cut: %d",iCh,fHmpUserCut[iCh]));
+   for(Int_t iPol=0;iPol<5;iPol++) 
+     AliInfo(Form(" HMPID momentum dependent distnce parameters: param[%d]=%lf",iPol,fHmpTrackMatchingDistParas[iPol]));
+  
 }
index 27832b8..5fb84c7 100644 (file)
@@ -8,39 +8,47 @@
 // Class to set HMPID reconstruction parameters (normal, HTA, UserCut ...    //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
-//
-//Email: Levente.Molnar@ba.infn.it
-//
 
-#include "TNamed.h"
+#include "AliDetectorRecoParam.h"
 
-class AliHMPIDRecoParam : public TNamed
+class AliHMPIDRecoParam : public AliDetectorRecoParam
 {
  public: 
   
   AliHMPIDRecoParam();                                                                  //ctor
-  AliHMPIDRecoParam(const AliHMPIDRecoParam &p);                                            //copy ctor 
-  AliHMPIDRecoParam& operator=(const AliHMPIDRecoParam &p);                                 // ass. op.
+  AliHMPIDRecoParam(const AliHMPIDRecoParam &p);                                        //copy ctor 
+  AliHMPIDRecoParam& operator=(const AliHMPIDRecoParam &p);                             // ass. op.
   virtual ~AliHMPIDRecoParam();                                                         //dtor
+
   
-  Bool_t   GetRecoMode(            )       const  { return fRecoMode;          }
-  Bool_t   GetUserCutMode(         )       const  { return fUserCutMode;       }
-  Int_t   GetUserCut(Int_t iCh)            const  { return fUserCut[iCh];      }
-  void    SetRecoMode(Bool_t recoMode)            { fRecoMode=recoMode;        }
-  void    SetUserCut(Int_t iChamb,Int_t ucCh)     { fUserCut[iChamb]=ucCh;     }              //set user cut for a given chamber
-  void    SetUserCutMode(Bool_t userCutMode)      { fUserCutMode=userCutMode;  }
-  
-  static   AliHMPIDRecoParam *GetUserModeParam();        // make reco parameters
+  static AliHMPIDRecoParam *GetLowFluxParam();                                          // reco params for low flux env.
+  static AliHMPIDRecoParam *GetHighFluxParam();                                         // reco params for high flux env. 
+  static AliHMPIDRecoParam *GetCosmicParam();                                           // reco params for cosmic  
+    
+  Bool_t   GetHmpRecoMode(            )        const            { return fHmpRecoMode;          }                  //kTRUE = normal tracking reco, kFALSE = HTA     
+  void     SetHmpRecoMode(Bool_t recoMode)                       { fHmpRecoMode=recoMode;        }                 //kTRUE = normal tracking reco, kFALSE = HTA   
+  Int_t    GetHmpUserCut(Int_t iCh)            const             { return fHmpUserCut[iCh];      }                 //user cut for the 7 chambers
+  void     SetHmpUserCut(Int_t iChamb,Int_t ucCh)     { fHmpUserCut[iChamb]=ucCh; Printf("fUserCut[%d]=%d",iChamb,ucCh);    }       //set user cut (DAQ Sigma) for a given chamber
+  Bool_t   IsFixedDistCut()                    const             { return fHmpFixedDistCut;      }                  //if kTRUE the track matching  distance is a fix number, if kFALSE the distance depends on momentum
+  void     SetIsFixedDistCut(Bool_t isFix)                       { fHmpFixedDistCut=isFix;       }                  //Change from fix distance cut to parameterized
+  Double_t GetHmpTrackMatchingDist()           const             { return fHmpTrackMatchingDist; }                  //Get distance between the MIP cluster
+  void     SetHmpTrackMatchingDist(Double_t dist)                { fHmpTrackMatchingDist=dist;   }                  //Set distance between the MIP cluster
+  Double_t GetHmpTrackMatchingDistParam(Int_t par) const         {return fHmpTrackMatchingDistParas[par];}          //Prevision to get  momentum dependen track matching parameters
+  void     SetHmpTrackMatchingDistParam(Int_t par, Double_t val) {fHmpTrackMatchingDistParas[par]=val;}             //Prevision to set  momentum dependen track matching parameters
+
+  virtual void PrintParameters() const;
   
  
   protected:
    
-  Bool_t  fRecoMode;                                    //kTRUE = normal tracking reco, kFALSE = HTA
-  Int_t   fUserCut[7];                                 //user cut for the 7 chambers
-  Bool_t  fUserCutMode;                                 //kTRUE =  get user cut from OCDB, kFALSE = get user cut from AliHMPIDRecoParam
+  Bool_t   fHmpRecoMode;                                    //kTRUE = normal tracking reco, kFALSE = HTA
+  Int_t    fHmpUserCut[7];                                  //user cut for the 7 chambers
+  Bool_t   fHmpFixedDistCut;                                //if kTRUE the track matching  distance is a fix number, if kFALSE the distance depends on momentum
+  Double_t fHmpTrackMatchingDist;                           //distance between the MIP cluster
+  Double_t fHmpTrackMatchingDistParas[5];                   //Prevision for momentum dependen track matching
   
 
-      ClassDef(AliHMPIDRecoParam, 1) 
+  ClassDef(AliHMPIDRecoParam, 3) 
 };
 #endif
 
index 5d50600..b5262d9 100644 (file)
 #include <AliLog.h>                //
 #include "AliHMPIDRawStream.h"     //ConvertDigits()
 #include "AliHMPIDRecoParam.h"     //ctor
+
 ClassImp(AliHMPIDReconstructor)
 
-AliHMPIDRecoParam* AliHMPIDReconstructor::fgkRecoParam =0;  // 
+//AliHMPIDRecoParam* AliHMPIDReconstructor::fgkRecoParam =0;  // 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDReconstructor::AliHMPIDReconstructor():AliReconstructor(),fUserCut(0),fDaqSig(0),fDig(0),fClu(0)
 {
@@ -39,6 +40,7 @@ AliHMPIDReconstructor::AliHMPIDReconstructor():AliReconstructor(),fUserCut(0),fD
 //ctor
 //
   AliHMPIDParam::Instance();                                                        //geometry loaded for reconstruction
+
   fUserCut = new Int_t[7];
   fClu=new TObjArray(AliHMPIDParam::kMaxCh+1); fClu->SetOwner(kTRUE);
   fDig=new TObjArray(AliHMPIDParam::kMaxCh+1); fDig->SetOwner(kTRUE);
@@ -49,19 +51,23 @@ AliHMPIDReconstructor::AliHMPIDReconstructor():AliReconstructor(),fUserCut(0),fD
     pClus->SetUniqueID(i);
     fClu->AddAt(pClus,i);
   }
-
-   if(fgkRecoParam!=0x0 && fgkRecoParam->GetUserCutMode()==kTRUE) {
+   
+   if(AliHMPIDReconstructor::GetRecoParam()) {
     for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
-      fUserCut[iCh] = fgkRecoParam->GetUserCut(iCh);
+      fUserCut[iCh] = AliHMPIDReconstructor::GetRecoParam()->GetHmpUserCut(iCh);
       AliDebug(1,Form("UserCut successfully loaded (from RecoParam) for chamber %i -> %i ",iCh,fUserCut[iCh]));
     }
-  }  
+  }
   else {
     for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
       fUserCut[iCh] = 3;                                                                             // minimal requirement for sigma cut
       AliDebug(1,Form("UserCut loaded from defaults for chamber %i -> %i ",iCh,fUserCut[iCh]));
+      AliDebug(1,Form("Cannot get AliHMPIDRecoParam!"));
+      }
     }
-  } 
+
+  
 
   AliCDBEntry *pDaqSigEnt =AliCDBManager::Instance()->Get("HMPID/Calib/DaqSig");  //contains TObjArray of TObjArray 14 TMatrixF sigmas values for pads 
   if(!pDaqSigEnt) AliFatal("No pedestals from DAQ!");
index d0588f1..4a5b00c 100644 (file)
@@ -8,11 +8,11 @@
 #include <AliReconstructor.h>        //base class
 #include "AliHMPIDTracker.h"         //CreateTracker()
 #include "AliHMPIDDigit.h"           //Dig2Clu(), UseDig()
-#include "AliHMPIDRecoParam.h"       //Init
-
+#include "AliHMPIDRecoParam.h"
 #include <TMatrixF.h>                //UseDig()
 #include <TClonesArray.h>            //UseDig()
 #include <TObjArray.h>               //SigConv()
+
 class AliRawReader;                  //Reconstruct() with raw data   
 class AliHMPIDCluster;               //Dig2Clu()
 
@@ -36,12 +36,9 @@ public:
   static        void           FormClu (AliHMPIDCluster *pClu,AliHMPIDDigit *pDig,TClonesArray *pDigLst,TMatrixF *pPadMap);//cluster formation recursive algorithm
   static inline AliHMPIDDigit* UseDig  (Int_t padX,Int_t padY,                    TClonesArray *pDigLst,TMatrixF *pDigMap);//use this pad's digit to form a cluster
   inline Bool_t                IsDigSurvive(AliHMPIDDigit *pDig                                                     )const;//check for sigma cut
-  void SetRecoParam(AliHMPIDRecoParam *recopar){ fgkRecoParam = recopar;}
-  static const AliHMPIDRecoParam* GetRecoParam(){ return fgkRecoParam;}
-
-  
+  static const AliHMPIDRecoParam* GetRecoParam() { return dynamic_cast<const AliHMPIDRecoParam*>(AliReconstructor::GetRecoParam(5)); }  //5 is the HMPID detector code
   protected:
-  static AliHMPIDRecoParam*  fgkRecoParam;      // Pointer to HMPID RecoParams
   Int_t     *fUserCut;                 // n sigmas for pedestals decided by the User for each chamber(if in OCDB)
   TObjArray *fDaqSig;                  // container for the pad pedestal sigmas
   TObjArray *fDig;                     // tmp list of digits
@@ -51,7 +48,7 @@ public:
   AliHMPIDReconstructor(const AliHMPIDReconstructor& r);              //dummy copy constructor
   AliHMPIDReconstructor &operator=(const AliHMPIDReconstructor& r);   //dummy assignment operator
 //  
-  ClassDef(AliHMPIDReconstructor, 1)   // class for the HMPID reconstruction
+  ClassDef(AliHMPIDReconstructor, 2)        // class for the HMPID reconstruction
 };
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
index 0374017..5132a93 100644 (file)
 //.
 
 class AliESDEvent;      //Recon()     
-class AliESDtrack; //IntTrkCha()
+class AliESDtrack;      //IntTrkCha()
 class AliHMPIDtrack;
+class AliHMPIDRecoParam;
+
 class AliHMPIDTracker : public AliTracker
 {
 public:
index bf115eb..b19b337 100644 (file)
@@ -35,7 +35,7 @@ public:
    Int_t    GetProlongation(Double_t xk, Double_t &y, Double_t &z);
    Bool_t   Intersect(Double_t pnt[3], Double_t norm[3]) const;                                  //HMPID method moved from AliExternalTrackParam
    Bool_t   Update(const AliHMPIDCluster *pClu, Double_t chi2, Int_t index);
-              
+   
 protected:
    Bool_t   Update(const AliCluster */*c*/, Double_t /*chi2*/, Int_t /*idx*/) {return 0;}
    Double_t GetPredictedChi2(const AliCluster */*c*/) const {return 0.;}
index 2045572..6c3b800 100644 (file)
@@ -691,16 +691,15 @@ void HmpConfig::WriteBatch()
     //---------------------------------------------
     if     (fTrkBG->GetButton(kRecoPar)->GetState())
       { 
-         fprintf(fp,"  AliHMPIDRecoParam * hmpidRecoParam = AliHMPIDRecoParam::GetUserModeParam(); //Get the HMPID reco param\n"); 
-         fprintf(fp,"  hmpidRecoParam->SetUserCutMode(kTRUE);                                      //Switch to RecoParam\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(0,4);                                            //eg cut for UserCutSigma (Values: ch0)\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(1,4);                                            //eg cut for UserCutSigma (Values: ch1)\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(2,4);                                            //eg cut for UserCutSigma (Values: ch2)\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(3,4);                                            //eg cut for UserCutSigma (Values: ch3)\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(4,4);                                            //eg cut for UserCutSigma (Values: ch4)\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(5,4);                                            //eg cut for UserCutSigma (Values: ch5)\n");
-         fprintf(fp,"  hmpidRecoParam->SetUserCut(6,4);                                            //eg cut for UserCutSigma (Values: ch6)\n");
-         fprintf(fp,"  AliHMPIDReconstructor::SetRecoParam(hmpidRecoParam);                        //Pass the RecoPar to the Reconstructor\n");
+         fprintf(fp,"  AliHMPIDRecoParam *hmpidRecoParam=AliHMPIDReconstructor::GetRecoParam();    //Get the HMPID reco param\n"); 
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(0,4);                                            //eg cut for UserCutSigma (Values: ch0)\n");
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(1,4);                                            //eg cut for UserCutSigma (Values: ch1)\n");
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(2,4);                                            //eg cut for UserCutSigma (Values: ch2)\n");
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(3,4);                                            //eg cut for UserCutSigma (Values: ch3)\n");
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(4,4);                                            //eg cut for UserCutSigma (Values: ch4)\n");
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(5,4);                                            //eg cut for UserCutSigma (Values: ch5)\n");
+         fprintf(fp,"  hmpidRecoParam->SetHmpUserCut(6,4);                                            //eg cut for UserCutSigma (Values: ch6)\n");
+         fprintf(fp,"  AliHMPIDReconstructor::SetRecoParam(hmpidRecoParam);                          //Pass the RecoPar to the Reconstructor\n");
       }
     //---------------------------------------------