cosmetics

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

diff --git a/HMPID/AliHMPIDPreprocessor.cxx b/HMPID/AliHMPIDPreprocessor.cxx
index d1b7a62b128310afc1bf4ed72dedbe7d7d568d01..e74ebac87d4360206ca569f127990af0f3e0a97d 100644 (file)
--- a/HMPID/AliHMPIDPreprocessor.cxx
+++ b/HMPID/AliHMPIDPreprocessor.cxx
@@ -19,6 +19,9 @@
 //.
 //.
 //.
+using std::hex;
+using std::ifstream;
+using std::dec;
 ClassImp(AliHMPIDPreprocessor)
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -75,7 +78,7 @@ Bool_t AliHMPIDPreprocessor::ProcNoiseMap()
   // eg. DDL turn on/off after PEDESTAL run and between PHYSICS runs.
   // Returns kFALSE on success
  
-  Bool_t stProcNoise=kTRUE;
+  Bool_t stProcNoise=kFALSE;
   TFile  *fNoiseFile;
   TH2F   *hNoiseMap = 0x0;
   
@@ -97,9 +100,9 @@ Bool_t AliHMPIDPreprocessor::ProcNoiseMap()
   AliInfo("Storing Reference Data");
   stProcNoise = Store("Calib","NoiseMap",hNoiseMap,&metaDataHisto,0,kTRUE);
   if(!stProcNoise) {
-    Log("HMPID - failure to store Noise Map data results in OCDB"); return stProcNoise;   
+    Log("HMPID - failure to store Noise Map data results in OCDB");   
   }
-  return kFALSE;
+  return stProcNoise;
 }//ProcNoiseMap
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Bool_t AliHMPIDPreprocessor::ProcDcs(TMap* pMap)
@@ -128,8 +131,10 @@ Bool_t AliHMPIDPreprocessor::ProcDcs(TMap* pMap)
   
   Double_t xP,yP;
 
-  TF1 **pTin  = new TF1*[21];
-  TF1 **pTout = new TF1*[21];
+//  TF1 **pTin  = new TF1*[21];
+//  TF1 **pTout = new TF1*[21];
+  TF1  *pTin[21];
+  TF1 *pTout[21];
 
 // evaluate Environment Pressure
   
@@ -367,11 +372,15 @@ Double_t AliHMPIDPreprocessor::ProcTrans(TMap* pMap)
   
   Double_t sEnergProb=0, sProb=0;
 
-  Double_t tRefCR5 = 19. ;                                      // mean temperature of CR5 where the system is in place
+ // Double_t tRefCR5 = 19. ;                                      // mean temperature of CR5 where the system is in place
 
   Double_t eMean = 0;
       
   AliDCSValue *pVal;
+  
+  Double_t aCorrFactor[] = {0.937575212,0.93805688,0.938527113,0.938986068,0.939433897,0.939870746,0.940296755,0.94071206,0.941116795,0.941511085,0.941895054,0.942268821,0.942632502,
+                            0.942986208,0.943330047,0.943664126,0.943988544,0.944303401,0.944608794,0.944904814,0.945191552,0.945469097,0.945737533,0.945996945,0.946247412,
+                            0.946489015,0.94672183,0.946945933,0.947161396,0.947368291}; 
 
   for(Int_t i=0; i<30; i++){
 
@@ -436,21 +445,23 @@ Double_t AliHMPIDPreprocessor::ProcTrans(TMap* pMap)
  
    //evaluate correction factor to calculate trasparency (Ref. NIMA 486 (2002) 590-609)
     
-    Double_t aN1 = AliHMPIDParam::NIdxRad(photEn,tRefCR5);
-    Double_t aN2 = AliHMPIDParam::NMgF2Idx(photEn);
-    Double_t aN3 = 1;                              // Argon Idx
+    //Double_t aN1 = AliHMPIDParam::NIdxRad(photEn,tRefCR5);
+    //Double_t aN2 = AliHMPIDParam::NMgF2Idx(photEn);
+    //Double_t aN3 = 1;                              // Argon Idx
 
-    Double_t aR1               = ((aN1 - aN2)*(aN1 - aN2))/((aN1 + aN2)*(aN1 + aN2));
-    Double_t aR2               = ((aN2 - aN3)*(aN2 - aN3))/((aN2 + aN3)*(aN2 + aN3));
-    Double_t aT1               = (1 - aR1);
-    Double_t aT2               = (1 - aR2);
-    Double_t aCorrFactor       = (aT1*aT1)/(aT2*aT2);
+   // Double_t aR1               = ((aN1 - aN2)*(aN1 - aN2))/((aN1 + aN2)*(aN1 + aN2));
+  //  Double_t aR2               = ((aN2 - aN3)*(aN2 - aN3))/((aN2 + aN3)*(aN2 + aN3));
+   // Double_t aT1               = (1 - aR1);
+   // Double_t aT2               = (1 - aR2);
+   // Double_t aCorrFactor       = (aT1*aT1)/(aT2*aT2);
 
     // evaluate 15 mm of thickness C6F14 Trans
     Double_t aTransRad;
     
+    Double_t aConvFactor = 1.0 - 0.3/1.8;         
+        
     if(aRefFreon*aRefArgon>0) {
-      aTransRad  = TMath::Power((aCellFreon/aRefFreon)/(aCellArgon/aRefArgon)*aCorrFactor,1.5);
+      aTransRad  = TMath::Power((aCellFreon/aRefFreon)/(aCellArgon/aRefArgon)*aCorrFactor[i],aConvFactor);
     } else {
       return DefaultEMean();
     }