Bugs corrected in TF1 and some other functions cleared
authordibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 30 Mar 2006 16:13:00 +0000 (16:13 +0000)
committerdibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 30 Mar 2006 16:13:00 +0000 (16:13 +0000)
RICH/AliRICHParam.cxx
RICH/AliRICHParam.h

index f55c604..62efb83 100644 (file)
@@ -53,28 +53,14 @@ Double_t AliRICHParam::fgMass[5]              ={0.00051,0.10566,0.13957,0.49360,
 
 Double_t AliRICHParam::fEckovMin=5.5e-9; //GeV
 Double_t AliRICHParam::fEckovMax=8.5e-9; //GeV
-TF1 AliRICHParam::fgAbsC6F14("RabsC4F14","6512.39*(x<=7.75e-9)+(x>7.75e-9)*0.039/(-0.166+0.063e9*x-8.01e7*x^2+3.39e5*x^3)" ,fEckovMin,fEckovMin); 
-TF1 AliRICHParam::fgAbsSiO2 ("RabsSiO2" ,"333"                                                                             ,fEckovMin,fEckovMin); 
-TF1 AliRICHParam::fgAbsCH4  ("RabsCH4"  ,"6512.39*(x<=7.75e-9)+(x>7.75e-9)*0.039/(-0.166+0.063e9*x-8.01e7*x^2+3.39e5*x^3)" ,fEckovMin,fEckovMin);
-TF1 AliRICHParam::fgAbsAir  ("RabsAir"  ,"500"                                                                             ,fEckovMin,fEckovMin);  //len ???
-TF1 AliRICHParam::fgAbsCF4  ("RabsCF4"  ,"6512.39*(x<=7.75e-9)+(x>7.75e-9)*0.039/(-0.166+0.063e9*x-8.01e7*x^2+3.39e5*x^3)" ,fEckovMin,fEckovMin);
-TF1 AliRICHParam::fgAbsC4F10("RabsC4F10","1+0.25324e-6/(1.84e-4 - (1239.84e-9/x)^-2)"                                      ,fEckovMin,fEckovMin);  //Olav preprint
-TF1 AliRICHParam::fgAbsGel  ("RabsGel"  ,"400"                                                                             ,fEckovMin,fEckovMin);  //len ???
-
-TF1 AliRICHParam::fgIdxAir  ("RidxAir"  ,"1+1e-8*(8342.13 + 2406030/(130-(1.23984e-9/x)^2)+15597/(38.9-(1.23984e-9/x)^2))" ,fEckovMin,fEckovMin);  //???
-TF1 AliRICHParam::fgIdxSiO2 ("RidxSiO2" ,"sqrt(1+46.411/(10.666*10.666-x*x*1e18)+228.71/(18.125*18.125-x*x*1e18))"         ,fEckovMin,fEckovMin);  //TDR p.35
-TF1 AliRICHParam::fgIdxCH4  ("RidxCH4"  ,"1+0.12489e-6/(2.62e-4 - (1239.84e-9/x)^-2)"                                      ,fEckovMin,fEckovMin);  //Olav preprint
-TF1 AliRICHParam::fgIdxG30  ("RidxGel30","1.030"                                                                           ,fEckovMin,fEckovMin);  //???
-TF1 AliRICHParam::fgIdxG28  ("RidxGel28","1.028"                                                                           ,fEckovMin,fEckovMin);  //???
-TF1 AliRICHParam::fgIdxG26  ("RidxGel26","1.026"                                                                           ,fEckovMin,fEckovMin);  //???
-TF1 AliRICHParam::fgIdxG24  ("RidxGel24","1.024"                                                                           ,fEckovMin,fEckovMin);  //???
-TF1 AliRICHParam::fgIdxC4F10("RidxC4F10","1+0.25324e-6/(1.84e-4 - (1239.84e-9/x)^-2)"                                      ,fEckovMin,fEckovMin);  //Olav preprint
-TF1 AliRICHParam::fgIdxCF4  ("RidxCF4"  ,"1+0.12489e-6/(2.62e-4 - (1239.84e-9/x)^-2)"                                      ,fEckovMin,fEckovMin);  //Olav preprint
-
-TF1 AliRICHParam::fgQeApd("QeApd"    ,"0+(x>6e-9)*0.27*(1-exp(-(1e9*x-6)/0.3))"                                            ,fEckovMin,fEckovMin);  //???
-TF1 AliRICHParam::fgQeCsI("AbsApd"   ,"0.03"                                                                               ,fEckovMin,fEckovMin);  //prob
-
-
+TF1 AliRICHParam::fgAbsC6F14("RabsC4F14","6512.39*(x<=7.75e-9)+(x>7.75e-9)*0.039/(-0.166+0.063e9*x-8.01e7*x^2+3.39e5*x^3)" ,fEckovMin,fEckovMax); 
+TF1 AliRICHParam::fgAbsSiO2 ("RabsSiO2" ,"333"                                                                             ,fEckovMin,fEckovMax); 
+TF1 AliRICHParam::fgAbsCH4  ("RabsCH4"  ,"6512.39*(x<=7.75e-9)+(x>7.75e-9)*0.039/(-0.166+0.063e9*x-8.01e7*x^2+3.39e5*x^3)" ,fEckovMin,fEckovMax);
+TF1 AliRICHParam::fgAbsAir  ("RabsAir"  ,"500"                                                                             ,fEckovMin,fEckovMax);  //len ???
+
+TF1 AliRICHParam::fgIdxAir  ("RidxAir"  ,"1+1e-8*(8342.13 + 2406030/(130-(1.23984e-9/x)^2)+15597/(38.9-(1.23984e-9/x)^2))" ,fEckovMin,fEckovMax);  //???
+TF1 AliRICHParam::fgIdxSiO2 ("RidxSiO2" ,"sqrt(1+46.411/(10.666*10.666-x*x*1e18)+228.71/(18.125*18.125-x*x*1e18))"         ,fEckovMin,fEckovMax);  //TDR p.35
+TF1 AliRICHParam::fgIdxCH4  ("RidxCH4"  ,"1+0.12489e-6/(2.62e-4 - (1239.84e-9/x)^-2)"                                      ,fEckovMin,fEckovMax);  //Olav preprint
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliRICHParam::AliRICHParam():TNamed("RichParam","default version") 
 {
index 90ef9a7..8db972e 100644 (file)
@@ -107,21 +107,12 @@ public:
   static        Float_t    EckovMax      (                               ){return fEckovMax;}                         //min photon energy [GeV] defined in optical curves
   
   static        Float_t    AbsCH4        (Float_t gev                    );                                           //AbsLen [cm]=f(Eckov) [GeV] for CH4 used as amp gas
-  static        Float_t    AbsGel        (Float_t gev                    ){return fgAbsGel.Eval(gev);}                //AbsLen [cm]=f(Eckov) [GeV] for aerogel
   static        Float_t    AbsAir        (Float_t gev                    ){return fgAbsAir.Eval(gev);}                //AbsLen [cm]=f(Eckov) [GeV] for air
   
                 Float_t    IdxC6F14      (Float_t gev                    ){return fIdxC6F14->Eval(gev,fIdxC6F14->GetUniqueID());}  //n=f(Eckov) [GeV] for C6H14 used as radiator
   static        Float_t    IdxSiO2       (Float_t gev                    ){return fgIdxSiO2 .Eval(gev);}              //n=f(Eckov) [GeV] for SiO2 used as window TDR p.35
   static        Float_t    IdxCH4        (Float_t gev                    ){return fgIdxCH4  .Eval(gev);}              //n=f(Eckov) [GeV] for CF4 
-  static        Float_t    IdxG24        (Float_t gev                    ){return fgIdxG24  .Eval(gev);}              //n=f(Eckov) [GeV] for aerogel @1.024
-  static        Float_t    IdxG26        (Float_t gev                    ){return fgIdxG26  .Eval(gev);}              //n=f(Eckov) [GeV] for aerogel @1.026
-  static        Float_t    IdxG28        (Float_t gev                    ){return fgIdxG28  .Eval(gev);}              //n=f(Eckov) [GeV] for aerogel @1.028
-  static        Float_t    IdxG30        (Float_t gev                    ){return fgIdxG30  .Eval(gev);}              //n=f(Eckov) [GeV] for aerogel @1.030
   static        Float_t    IdxAir        (Float_t gev                    ){return fgIdxAir  .Eval(gev);}              //n=f(Eckov) [GeV] for air
-  static        Float_t    IdxCF4        (Float_t gev                    ){return fgIdxCF4  .Eval(gev);}              //n=f(Eckov) [GeV] for CF4 
-  
-  static        Float_t    QeApd         (Float_t gev                    ){return fgQeApd  .Eval(gev);}               //Q.E.=f(Eckov) [GeV] for APD
-  static        Float_t    QeCsI         (Float_t gev                    ){return fgQeCsI  .Eval(gev);}               //Q.E.=f(Eckov) [GeV] for CsI
   
                 void       CdbRead   (Int_t run,Int_t version           );                                           //read all calibration information for requested run
   
@@ -193,23 +184,11 @@ protected:
   static TF1   fgIdxSiO2;            //n=f(Ephot) [GeV] for window   quartz  SiO2 
   static TF1   fgIdxCH4;             //n=f(Ephot) [GeV] for MWPC     amp gas CF4  
   static TF1   fgIdxAir;             //n=f(Ephot) [GeV] for          air
-  static TF1   fgIdxC4F10;           //n=f(Ephot) [GeV] for radiator C4F10   
-  static TF1   fgIdxCF4;             //n=f(Ephot) [GeV] for radiator CF4 
-  static TF1   fgIdxG30;             //n=f(Ephot) [GeV] for radiator aerogel @1.030
-  static TF1   fgIdxG28;             //n=f(Ephot) [GeV] for radiator aerogel @1.028
-  static TF1   fgIdxG26;             //n=f(Ephot) [GeV] for radiator aerogel @1.026
-  static TF1   fgIdxG24;             //n=f(Ephot) [GeV] for radiator aerogel @1.024
   
   static TF1   fgAbsC6F14;           //abs len curve for radiator freon   C6F14, cm   versus GeV
   static TF1   fgAbsSiO2;            //abs len curve for window   quartz  SiO2 , cm   versus GeV  
   static TF1   fgAbsCH4;             //abs len curve for MWPC     methane CF4  , cm   versus GeV
   static TF1   fgAbsAir;             //abs len curve for air, cm versus GeV
-  static TF1   fgAbsC4F10;           //abs len curve for radiator C4F10    
-  static TF1   fgAbsCF4;             //abs len curve for radiator CF4 
-  static TF1   fgAbsGel;             //abs len curve for gel, cm versus GeV
-  
-  static TF1   fgQeCsI;              //QE=f(Ephot) [GeV] for MWPC PC CsI
-  static TF1   fgQeApd;              //QE=f(Ephot) [GeV] for APD
   
   static Bool_t     fgIsWireSag;            //wire sagitta ON/OFF flag
   static Bool_t     fgIsResolveClusters;    //declustering ON/OFF flag