Reverting...I was too fast

[u/mrichter/AliRoot.git] / HMPID / AliHMPIDParam.cxx

diff --git a/HMPID/AliHMPIDParam.cxx b/HMPID/AliHMPIDParam.cxx
index ae7045f66026c8762e9b193ff3bf88e49f791fa4..38ed89d78ca081accf10b7464de879fe36b5c238 100644 (file)
--- a/HMPID/AliHMPIDParam.cxx
+++ b/HMPID/AliHMPIDParam.cxx
@@ -51,6 +51,8 @@ Float_t AliHMPIDParam::fgkMaxPcX[]={0.,0.,0.,0.,0.,0.};
 Float_t AliHMPIDParam::fgkMinPcY[]={0.,0.,0.,0.,0.,0.};
 Float_t AliHMPIDParam::fgkMaxPcY[]={0.,0.,0.,0.,0.,0.};
 
+Bool_t AliHMPIDParam::fgMapPad[160][144][7];
+
 Float_t AliHMPIDParam::fgCellX=0.;
 Float_t AliHMPIDParam::fgCellY=0.;
 
@@ -64,10 +66,11 @@ Bool_t AliHMPIDParam::fgInstanceType=kTRUE;
 
 AliHMPIDParam* AliHMPIDParam::fgInstance=0x0;        //singleton pointer               
 
-Int_t AliHMPIDParam::fgSigmas=4;
+Int_t AliHMPIDParam::fgNSigmas  = 4;
+Int_t AliHMPIDParam::fgThreshold= 4;
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-AliHMPIDParam::AliHMPIDParam(Bool_t noGeo=kFALSE):
+AliHMPIDParam::AliHMPIDParam(Bool_t noGeo):
   TNamed("HmpidParam","default version"),
   fX(0), fY(0), fRefIdx(1.28947),fPhotEMean(6.675),fTemp(25)                          //just set a refractive index for C6F14 at ephot=6.675 eV @ T=25 C
 {
@@ -134,7 +137,17 @@ AliHMPIDParam::AliHMPIDParam(Bool_t noGeo=kFALSE):
   fX=0.5*SizeAllX();
   fY=0.5*SizeAllY();
   
-  for(Int_t i=kMinCh;i<=kMaxCh;i++) 
+      
+  for(Int_t ich=kMinCh;ich<=kMaxCh;ich++) {
+    for(Int_t padx=0;padx<160;padx++) {
+       for(Int_t pady=0;pady<144;pady++) {
+         fgMapPad[padx][pady][ich] = kTRUE;             //init all the pads are active at the beginning....
+       }
+     }
+   }
+     
+
+  for(Int_t i=kMinCh;i<=kMaxCh;i++)
     if(gGeoManager && gGeoManager->IsClosed()) {
       TGeoPNEntry* pne = gGeoManager->GetAlignableEntry(Form("/HMPID/Chamber%i",i));
       if (!pne) {
@@ -354,3 +367,18 @@ Double_t AliHMPIDParam::SigGeom(Double_t trkTheta,Double_t trkPhi,Double_t theta
   return trErr*dtdT;
 }//SigGeom()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Double_t AliHMPIDParam::SigmaCorrFact  (Int_t iPart, Double_t occupancy) 
+{
+  Double_t corr = 1.0;
+                                                                                                             
+  switch(iPart) {
+    case 0: corr = 0.115*occupancy + 1.166; break; 
+    case 1: corr = 0.115*occupancy + 1.166; break;
+    case 2: corr = 0.115*occupancy + 1.166; break;
+    case 3: corr = 0.065*occupancy + 1.137; break;
+    case 4: corr = 0.048*occupancy + 1.202; break;
+  }
+                                                                                                                           
+ return corr; 
+}
+