minors
authorgvolpe <gvolpe@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 26 Jun 2013 10:34:01 +0000 (10:34 +0000)
committergvolpe <gvolpe@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 26 Jun 2013 10:34:01 +0000 (10:34 +0000)
HMPID/AliHMPIDRecoParam.cxx
HMPID/AliHMPIDRecoParam.h
HMPID/AliHMPIDReconstructor.cxx
HMPID/AliHMPIDReconstructor.h
HMPID/AliHMPIDTracker.cxx
HMPID/AliHMPIDTracker.h
HMPID/AnalysisTrainHMPID.C
HMPID/CMakelibHMPIDrec.pkg
HMPID/HMPIDrecLinkDef.h
HMPID/MakeHMPIDRecoParam.C

index b30965b..85ff3ac 100644 (file)
@@ -59,7 +59,6 @@ AliHMPIDRecoParam& AliHMPIDRecoParam::operator=(const AliHMPIDRecoParam &p)
 {
 //
 // assign. operator
-//
   if(this!=&p){
     AliDetectorRecoParam::operator=(p);
     this->fHmpRecoMode= p.fHmpRecoMode;
@@ -82,7 +81,7 @@ AliHMPIDRecoParam *AliHMPIDRecoParam::GetLowFluxParam(){
   //
   // Set HMPID Reco Params for Low Flux environment
   //
-  AliHMPIDRecoParam *hmpParam = new AliHMPIDRecoParam;
+  AliHMPIDRecoParamV1 *hmpParam = new AliHMPIDRecoParamV1;
   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
@@ -149,8 +148,8 @@ void AliHMPIDRecoParam::PrintParameters() const
   //
   // Printing of the used HMPID reconstruction parameters
   //
-   AliInfo(Form("%s",AliHMPIDRecoParam::GetName()));
-   AliInfo(Form("IsDefault: %d",AliHMPIDRecoParam::IsDefault()));
+   AliInfo(Form("%s",AliHMPIDRecoParamV1::GetName()));
+   AliInfo(Form("IsDefault: %d",AliHMPIDRecoParamV1::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));
index 5fb84c7..9ac19c5 100644 (file)
@@ -7,6 +7,8 @@
 //                                                                           //
 // Class to set HMPID reconstruction parameters (normal, HTA, UserCut ...    //
 //                                                                           //
+//                                                                           //
+//                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "AliDetectorRecoParam.h"
@@ -15,15 +17,15 @@ class AliHMPIDRecoParam : public AliDetectorRecoParam
 {
  public: 
   
-  AliHMPIDRecoParam();                                                                  //ctor
-  AliHMPIDRecoParam(const AliHMPIDRecoParam &p);                                        //copy ctor 
-  AliHMPIDRecoParam& operator=(const AliHMPIDRecoParam &p);                             // ass. op.
-  virtual ~AliHMPIDRecoParam();                                                         //dtor
+  AliHMPIDRecoParam();                                                                                           //ctor
+  AliHMPIDRecoParam(const AliHMPIDRecoParam &p);                                                               //copy ctor 
+  AliHMPIDRecoParam& operator=(const AliHMPIDRecoParam &p);                                                    // ass. op.
+  virtual ~AliHMPIDRecoParam();                                                                                  //dtor
 
   
-  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  
+  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   
index 47186e4..78170cf 100644 (file)
@@ -28,7 +28,7 @@
 #include <AliRawReader.h>          //Reconstruct() for raw digits
 #include <AliLog.h>                //
 #include "AliHMPIDRawStream.h"     //ConvertDigits()
-#include "AliHMPIDRecoParamV1.h"   //ctor
+#include "AliHMPIDRecoParam.h"     //ctor
 
 ClassImp(AliHMPIDReconstructor)
 
@@ -129,14 +129,14 @@ void AliHMPIDReconstructor::Reconstruct(TTree *pDigTree,TTree *pCluTree)const
    if(AliHMPIDReconstructor::GetRecoParam()) {
     for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
       pUserCut[iCh] = AliHMPIDReconstructor::GetRecoParam()->GetHmpUserCut(iCh);
-      AliDebug(1,Form("UserCut successfully loaded (from AliHMPIDRecoParamV1) for chamber %i -> %i ",iCh,pUserCut[iCh]));
+      AliDebug(1,Form("UserCut successfully loaded (from AliHMPIDRecoParam) for chamber %i -> %i ",iCh,pUserCut[iCh]));
     }
   }
   else {
     for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
       pUserCut[iCh] = 4;                                                                             // minimal requirement for sigma cut
       AliDebug(1,Form("UserCut loaded from defaults for chamber %i -> %i ",iCh,pUserCut[iCh]));
-      AliDebug(1,Form("Cannot get AliHMPIDRecoParamV1!"));
+      AliDebug(1,Form("Cannot get AliHMPIDRecoParam!"));
       }
     }  
   
@@ -173,14 +173,14 @@ void AliHMPIDReconstructor::ConvertDigits(AliRawReader *pRR,TTree *pDigTree)cons
    if(AliHMPIDReconstructor::GetRecoParam()) {
     for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
       pUserCut[iCh] = AliHMPIDReconstructor::GetRecoParam()->GetHmpUserCut(iCh);
-      AliDebug(1,Form("UserCut successfully loaded (from AliHMPIDRecoParamV1) for chamber %i -> %i ",iCh,pUserCut[iCh]));
+      AliDebug(1,Form("UserCut successfully loaded (from AliHMPIDRecoParam) for chamber %i -> %i ",iCh,pUserCut[iCh]));
     }
   }
   else {
     for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
       pUserCut[iCh] = 4;                                                                             // minimal requirement for sigma cut
       AliDebug(1,Form("UserCut loaded from defaults for chamber %i -> %i ",iCh,pUserCut[iCh]));
-      AliDebug(1,Form("Cannot get AliHMPIDRecoParamV1!"));
+      AliDebug(1,Form("Cannot get AliHMPIDRecoParam!"));
       }
     }  
       
index 4115df8..6ec6835 100644 (file)
@@ -8,7 +8,7 @@
 #include <AliReconstructor.h>        //base class
 #include "AliHMPIDTracker.h"         //CreateTracker()
 #include "AliHMPIDDigit.h"           //Dig2Clu(), UseDig()
-#include "AliHMPIDRecoParamV1.h"
+#include "AliHMPIDRecoParam.h"
 #include <TMatrixF.h>                //UseDig()
 #include <TClonesArray.h>            //UseDig()
 #include <TObjArray.h>               //SigConv()
@@ -38,7 +38,7 @@ 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(Int_t *pUserCut, AliHMPIDDigit *pDig                                         )const;//check for sigma cut
-  static const AliHMPIDRecoParamV1* GetRecoParam() { return dynamic_cast<const AliHMPIDRecoParamV1*>(AliReconstructor::GetRecoParam(5)); }  //5 is the HMPID detector code
+  static const AliHMPIDRecoParam* GetRecoParam() { return dynamic_cast<const AliHMPIDRecoParam*>(AliReconstructor::GetRecoParam(5)); }  //5 is the HMPID detector code
  
   protected:
   TObjArray *fDaqSig;                  // container for the pad pedestal sigmas
index 1fdc011..fb25d8e 100644 (file)
@@ -4,7 +4,7 @@
 #include "AliHMPIDParam.h"       //GetTrackPoint(),PropagateBack()
 #include "AliHMPIDPid.h"         //Recon(),reconHTA()
 #include "AliHMPIDRecon.h"       //Recon()
-#include "AliHMPIDRecoParamV1.h"   //Recon()
+#include "AliHMPIDRecoParam.h"   //Recon()
 #include "AliHMPIDReconstructor.h"//Recon()
 #include "AliHMPIDReconHTA.h"    //ReconHTA()
 #include <AliLog.h>              //Recon()  
index c2ab9c8..7108489 100644 (file)
@@ -13,7 +13,7 @@
 class AliESDEvent;      //Recon()     
 class AliESDtrack;      //IntTrkCha()
 class AliHMPIDtrack;
-class AliHMPIDRecoParamV1;
+class AliHMPIDRecoParam;
 class TTreeSRedirector;
 
 class AliHMPIDTracker : public AliTracker
index 9719079..9e03bb2 100644 (file)
@@ -552,12 +552,12 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("ANALYSISalice", mode, kTRUE);
             success &= LoadLibrary("CORRFW", mode, kTRUE);
          } else {   
-            success &= LoadLibrary("libSTEERBase.so", mode);
-            success &= LoadLibrary("libESD.so", mode);
-            success &= LoadLibrary("libAOD.so", mode);
-            success &= LoadLibrary("libANALYSIS.so", mode);
-            success &= LoadLibrary("libANALYSISalice.so", mode);
-            success &= LoadLibrary("libCORRFW.so", mode);
+            success &= LoadLibrary("libSTEERBase.so",     mode, kTRUE);
+            success &= LoadLibrary("libESD.so",           mode, kTRUE);
+            success &= LoadLibrary("libAOD.so",           mode, kTRUE);
+            success &= LoadLibrary("libANALYSIS.so",      mode, kTRUE);
+            success &= LoadLibrary("libANALYSISalice.so", mode, kTRUE);
+            success &= LoadLibrary("libCORRFW.so",        mode, kTRUE);
             gROOT->ProcessLine(".include $ALICE_ROOT/include");
          }
          break;
index 9dcf545..7d44279 100644 (file)
@@ -32,7 +32,6 @@ set ( SRCS
     AliHMPIDTracker.cxx 
     AliHMPIDRecon.cxx 
     AliHMPIDRecoParam.cxx 
-    AliHMPIDRecoParamV1.cxx 
     AliHMPIDReconHTA.cxx 
     AliHMPIDPid.cxx 
     AliHMPIDQADataMakerRec.cxx 
index 1dd794a..c2e3683 100644 (file)
@@ -9,7 +9,6 @@
 #pragma link C++ class  AliHMPIDRecon+;
 #pragma link C++ class  AliHMPIDPid+;
 #pragma link C++ class  AliHMPIDRecoParam+;
-#pragma link C++ class  AliHMPIDRecoParamV1+;
 #pragma link C++ class  AliHMPIDReconHTA+;
 #pragma link C++ class  AliHMPIDQADataMakerRec+;
 
index b75fa35..3609fd7 100644 (file)
@@ -6,17 +6,52 @@ void MakeHMPIDRecoParam(AliRecoParam::EventSpecie_t default=AliRecoParam::kLowMu
   AliCDBManager* man = AliCDBManager::Instance();
   if(!man->IsDefaultStorageSet()) man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
-  TObject *recoParamArray = new TObject();
+  TObjArray *recoParamArray = new TObjArray();
   
+  {
+         AliHMPIDRecoParam* hmpRecoParam = AliHMPIDRecoParam::GetLowFluxParam();
+         hmpRecoParam->SetEventSpecie(AliRecoParam::kLowMult);
+          hmpRecoParam->SetAsDefault();
+         recoParamArray->AddLast(hmpRecoParam);
+          hmpRecoParam->PrintParameters();
+  }
+  {
+         AliHMPIDRecoParam* hmpRecoParam = AliHMPIDRecoParam::GetHighFluxParam();
+         hmpRecoParam->SetEventSpecie(AliRecoParam::kHighMult);
+         recoParamArray->AddLast(hmpRecoParam);
+          hmpRecoParam->PrintParameters();
+
+  }
+  {
+         AliHMPIDRecoParam* hmpRecoParam = AliHMPIDRecoParam::GetCosmicParam();
+         hmpRecoParam->SetEventSpecie(AliRecoParam::kCosmic);
+         recoParamArray->AddLast(hmpRecoParam);
+          hmpRecoParam->PrintParameters();
+  }
+  
+  // Set the default
+  Bool_t defaultIsSet = kFALSE;
+  for(Int_t i =0; i < recoParamArray->GetEntriesFast(); i++) {
+    AliDetectorRecoParam *param = (AliDetectorRecoParam *)recoParamArray->UncheckedAt(i);
+    if (!param) continue;
+    if (default & param->GetEventSpecie()) {
+      param->SetAsDefault();
+      defaultIsSet = kTRUE;
+    }
+  }
+  if (!defaultIsSet) {
+    Error("The default reconstruction parameters are not set! Exiting...");
+    return;
+  }
+  
   AliCDBMetaData *md= new AliCDBMetaData();
-  md->SetResponsible("Domenico DiBari");
-  md->SetComment("Reconstruction parameters of HMPID, v1");
+  md->SetResponsible("Giacomo Volpe");
+  md->SetComment("Reconstruction parameters of HMPID");
   md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
   md->SetBeamPeriod(0);
   AliCDBId id("HMPID/Calib/RecoParam",0,AliCDBRunRange::Infinity());
   man->GetDefaultStorage()->Put(recoParamArray,id, md);
   
-  
-  
   return;
 }