AliITSRecoParam retrieved from the OCDB

diff --git a/ITS/AliITSClusterFinderV2SDD.cxx b/ITS/AliITSClusterFinderV2SDD.cxx
index 9c49f2843db16dcf049cbc6ea6d10f2dfa78f0d1..e4fd646814fd97e0e4b7b45d07626b5432647d0f 100644 (file)
--- a/ITS/AliITSClusterFinderV2SDD.cxx
+++ b/ITS/AliITSClusterFinderV2SDD.cxx
@@ -126,7 +126,7 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
   if(!repa){
     repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
     if(!repa){
-      repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParamDefault();
+      repa = AliITSRecoParam::GetHighFluxParam();
       AliWarning("Using default AliITSRecoParam class");
     }
   }

diff --git a/ITS/AliITSClusterFinderV2SPD.cxx b/ITS/AliITSClusterFinderV2SPD.cxx
index 1b5429b5e862a223a5c199b368a921d76eb9e991..7b839970ed53740887cf6ac38dd5bb386517fd42 100644 (file)
--- a/ITS/AliITSClusterFinderV2SPD.cxx
+++ b/ITS/AliITSClusterFinderV2SPD.cxx
@@ -91,7 +91,7 @@ Int_t AliITSClusterFinderV2SPD::ClustersSPD(AliBin* bins, TClonesArray* digits,T
   if(!repa){
     repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
     if(!repa){
-      repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParamDefault();
+      repa = AliITSRecoParam::GetHighFluxParam();
       AliWarning("Using default AliITSRecoParam class");
     }
   }

diff --git a/ITS/AliITSClusterFinderV2SSD.cxx b/ITS/AliITSClusterFinderV2SSD.cxx
index 54d3ff22b36e1827195c23abca4131bda247dbe6..2ba67282716c29add4029aeba312381c7b84ed03 100644 (file)
--- a/ITS/AliITSClusterFinderV2SSD.cxx
+++ b/ITS/AliITSClusterFinderV2SSD.cxx
@@ -94,7 +94,7 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   if(!repa){
     repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
     if(!repa){
-      repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParamDefault();
+      repa = AliITSRecoParam::GetHighFluxParam();
       AliWarning("Using default AliITSRecoParam class");
     }
   }
@@ -262,7 +262,7 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input,
   if(!repa){
     repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
     if(!repa){
-      repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParamDefault();
+      repa = AliITSRecoParam::GetHighFluxParam();
       AliWarning("Using default AliITSRecoParam class");
     }
   }
@@ -687,7 +687,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
   if(!repa){
     repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
     if(!repa){
-      repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParamDefault();
+      repa = AliITSRecoParam::GetHighFluxParam();
       AliWarning("Using default AliITSRecoParam class");
     }
   }

diff --git a/ITS/AliITSDetTypeRec.cxx b/ITS/AliITSDetTypeRec.cxx
index 011f2a5125a2ca6bf98f541df3877155dd4f3338..49a56239bb09228b2b1977c0af3605fb67f6ccd8 100644 (file)
--- a/ITS/AliITSDetTypeRec.cxx
+++ b/ITS/AliITSDetTypeRec.cxx
@@ -43,6 +43,8 @@
 #include "AliITSRawClusterSDD.h"
 #include "AliITSRawClusterSSD.h"
 #include "AliITSRecPoint.h"
+#include "AliITSReconstructor.h"
+#include "AliITSRecoParam.h"
 #include "AliITSCalibrationSDD.h"
 #include "AliITSMapSDD.h"
 #include "AliITSDriftSpeedArraySDD.h"
@@ -404,7 +406,8 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
     AliCDBEntry *entryPedestalSSD = AliCDBManager::Instance()->Get("ITS/Calib/PedestalSSD");
     AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD");
     AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
-
+    // Entry for the AliITSRecoParam object
+    AliCDBEntry *entryRP = AliCDBManager::Instance()->Get("ITS/Calib/RecoParam/");
   AliCDBEntry *entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD");
   AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD");
   AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD");
@@ -415,7 +418,7 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
 
   if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || 
      !entryPedestalSSD || !entryBadChannelsSSD || 
-     !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD){
+     !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD || !entryRP){
     AliFatal("Calibration object retrieval failed! ");
     return kFALSE;
   }    
@@ -472,6 +475,16 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
   if(!cacheStatus)entry2SSD->SetObject(NULL);
   entry2SSD->SetOwner(kTRUE);
 
+  AliITSRecoParam *rp = (AliITSRecoParam*)entryRP->GetObject();
+  if(!cacheStatus)entryRP->SetObject(NULL);
+  entryRP->SetOwner(kTRUE);
+  if(!AliITSReconstructor::GetRecoParam()){
+    AliITSReconstructor::SetRecoParam(rp);
+  }
+  else {
+    AliWarning("AliITSRecoPAram object has been already set in AliITSReconstructor. The OCDB instance will not be used\n");
+  }
+
   // DB entries are deleted. In this way metadeta objects are deleted as well
   if(!cacheStatus){
     delete entrySPD;

diff --git a/ITS/AliITSRecoParam.cxx b/ITS/AliITSRecoParam.cxx
index 9dae10740a350f46543abfab3ccfd5180365e676..186adef070536324b6cecf5a764688b00be26eb2 100644 (file)
--- a/ITS/AliITSRecoParam.cxx
+++ b/ITS/AliITSRecoParam.cxx
@@ -451,3 +451,34 @@ void AliITSRecoParam::SetLayersParameters()
 
   return;
 }
+//_____________________________________________________________________________
+void AliITSRecoParam::PrintParameters() const 
+{
+  //
+  // print parameters
+  //
+
+  printf("=============================  AliITSRecoParam::PrintParameters ");
+  printf("============================= \n \n ");
+  for(Int_t i=0; i<AliITSgeomTGeo::kNLayers; i++) {
+    if(!fLayersToSkip[i]) {
+      printf("ITS Traking: using layer %d\n",i);
+    } else {
+      printf("ITS Traking: skipping layer %d\n",i);
+    }
+  }
+  for(Int_t i=0; i<AliITSgeomTGeo::kNLayers; i++) {
+    if(fUseAmplitudeInfo[i]) {
+      printf("ITS Traking: use amplitude info for layer %d\n",i);
+    } else {
+      printf("ITS Traking: don't use amplitude info for layer %d\n",i);
+    }
+  }
+  for(Int_t i=0; i<AliITSgeomTGeo::kNLayers; i++)
+    printf("Layer %d:\n  sigmaY2 %f, sigma Z2 %f\n  max norm chi2 for non constrained tracks %f\n  max norm chi2 for constrained tracks %f\n  max predicted chi2 (cluster & track prol.) %f\n",i,fSigmaY2[i],fSigmaZ2[i],fMaxNormChi2NonC[i],fMaxNormChi2C[i],fMaxChi2s[i]);
+
+
+  Dump();
+
+  return;
+}

diff --git a/ITS/AliITSRecoParam.h b/ITS/AliITSRecoParam.h
index 5823a9fb20c0ec580bdba222c840cbe802ccf94d..d0fd381fc70229d101921be666f13df228c0cf56 100644 (file)
--- a/ITS/AliITSRecoParam.h
+++ b/ITS/AliITSRecoParam.h
@@ -63,6 +63,8 @@ class AliITSRecoParam : public AliDetectorRecoParam
   static Double_t GetSPDdetzlength() { return fgkSPDdetzlength; }
   static Double_t GetSPDdetxlength() { return fgkSPDdetxlength; }
 
+  void PrintParameters() const; 
+
   Double_t GetSigmaY2(Int_t i) const { return fSigmaY2[i]; }
   Double_t GetSigmaZ2(Int_t i) const { return fSigmaZ2[i]; }
 

diff --git a/ITS/AliITSReconstructor.cxx b/ITS/AliITSReconstructor.cxx
index 037c02124555bef1f44c66e1a953226cae1f7c31..38a8f2c5d0b00a3ecc5bd47cac1cbef891655dff 100644 (file)
--- a/ITS/AliITSReconstructor.cxx
+++ b/ITS/AliITSReconstructor.cxx
@@ -44,7 +44,6 @@
 
 
 ClassImp(AliITSReconstructor)
-AliITSRecoParam *AliITSReconstructor::fgRecoParamDefault = AliITSRecoParam::GetHighFluxParam();
 AliITSRecoParam *AliITSReconstructor::fgRecoParam =0;  // reconstruction parameters
 
 //___________________________________________________________________________
@@ -53,16 +52,12 @@ fItsPID(0),
 fDetTypeRec(0)
 {
   // Default constructor
-  if (!fgRecoParam) {
-    AliWarning("Using default reconstruction parameters");
-    fgRecoParam = fgRecoParamDefault;
-  }
 }
  //___________________________________________________________________________
 AliITSReconstructor::~AliITSReconstructor(){
 // destructor
   delete fItsPID;
-  if(!fgRecoParam && (fgRecoParam != fgRecoParamDefault)) delete fgRecoParam;
+  //  if(!fgRecoParam) delete fgRecoParam;
   if(fDetTypeRec) delete fDetTypeRec;
 } 
 //______________________________________________________________________
@@ -100,6 +95,12 @@ void AliITSReconstructor::Init() {
     fDetTypeRec = new AliITSDetTypeRec();
     fDetTypeRec->SetITSgeom(geom);
     fDetTypeRec->SetDefaults();
+
+    if(fgRecoParam) {
+      fgRecoParam->PrintParameters();
+    } else {
+      AliWarning("AliITSRecoParam has not been set");
+    } 
     
     return;
 }

diff --git a/ITS/AliITSReconstructor.h b/ITS/AliITSReconstructor.h
index b49bf6225b3869ee4a136a677d53723e5123b330..551b77401d144b4cc4f2128c850abecb352d8e21 100644 (file)
--- a/ITS/AliITSReconstructor.h
+++ b/ITS/AliITSReconstructor.h
@@ -41,17 +41,14 @@ public:
 
   static void SetRecoParam(AliITSRecoParam * param){ fgRecoParam = param;}
   static const AliITSRecoParam* GetRecoParam(){ return fgRecoParam;}
-  static const AliITSRecoParam* GetRecoParamDefault()
-                                { return fgRecoParamDefault;}
 
 private:
   //data
-  static AliITSRecoParam *fgRecoParamDefault; // def. reco. parameters
   static AliITSRecoParam *fgRecoParam; // reconstruction parameters
   AliITSpidESD           *fItsPID;      // Pid for ITS
   AliITSDetTypeRec       *fDetTypeRec;  // reconstructor
 
-  ClassDef(AliITSReconstructor, 4)   // class for the ITS reconstruction
+  ClassDef(AliITSReconstructor, 5)   // class for the ITS reconstruction
 };
 
 #endif

diff --git a/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root b/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root
new file mode 100644 (file)
index 0000000..d74f667
Binary files /dev/null and b/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root differ

diff --git a/ITS/MakeITSRecoParam.C b/ITS/MakeITSRecoParam.C
new file mode 100644 (file)
index 0000000..7ff0188
--- /dev/null
+++ b/ITS/MakeITSRecoParam.C
@@ -0,0 +1,58 @@
+void MakeITSRecoParam(Int_t type=1) {
+//========================================================================
+//
+// Steering macro for ITS reconstruction parameters
+//
+// Author: A.Dainese
+// Contact: andrea.dainese@lnl.infn.it
+//
+//========================================================================
+
+
+  const char* macroname = "MakeITSRecoParam.C";
+
+  // Activate CDB storage and load geometry from CDB
+  AliCDBManager* cdb = AliCDBManager::Instance();
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://OCDB");
+  
+  AliITSRecoParam *itsRecoParam = 0;
+  switch(type) {
+  case 0:
+    itsRecoParam = AliITSRecoParam::GetCosmicTestParam();
+    break;
+  case 1:
+    itsRecoParam = AliITSRecoParam::GetLowFluxParam();
+    break;
+  case 2:
+    itsRecoParam = AliITSRecoParam::GetHighFluxParam();
+    break;
+  case default:
+    printf("Wrong event type\n");
+    return;
+    break;
+  }
+  /*
+  itsRecoParam->SetUseTGeoInTracker(3);
+  itsRecoParam->SetClusterErrorsParam(0);
+  itsRecoParam->SetFindV0s(kTRUE);
+  itsRecoParam->SetAddVirtualClustersInDeadZone(kFALSE);
+  itsRecoParam->SetLayerToSkip(0);
+  itsRecoParam->SetLayerToSkip(1);
+  itsRecoParam->SetLayerToSkip(2);
+  itsRecoParam->SetLayerToSkip(3);
+  itsRecoParam->SetLayerToSkip(4);
+  itsRecoParam->SetLayerToSkip(5);
+  */
+
+  // save in CDB storage
+  AliCDBMetaData *md= new AliCDBMetaData();
+  md->SetResponsible("Andrea Dainese");
+  md->SetComment("Reconstruction parameters ITS");
+  md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
+  md->SetBeamPeriod(0);
+  AliCDBId id("ITS/Calib/RecoParam",0,AliCDBRunRange::Infinity());
+  AliCDBManager::Instance()->GetDefaultStorage()->Put(itsRecoParam,id, md);
+
+
+  return;
+}