]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
L1 latency different for mean, OrA an OrC sides
authoralla <alla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 3 Mar 2010 10:50:12 +0000 (10:50 +0000)
committeralla <alla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 3 Mar 2010 10:50:12 +0000 (10:50 +0000)
T0/AliT0RecoParam.cxx
T0/AliT0RecoParam.h
T0/AliT0Reconstructor.cxx

index c23fe0b5d62e971eccba381b908129a0a7e43a3e..3061e368ead18568cfa7d6cfb0e0cca05302742a 100644 (file)
@@ -44,6 +44,8 @@ AliT0RecoParam::AliT0RecoParam():
    fRefAmp(7),
    fRefPoint(0),
    fLatencyL1(0),  
+   fLatencyL1A(0),  
+   fLatencyL1C(0),  
    fLatencyHPTDC(0),      
    fVertexShift(0)   
 {
@@ -69,7 +71,9 @@ AliT0RecoParam::AliT0RecoParam(const AliT0RecoParam &p):
   fRefAmp(p.fRefAmp),
   fRefPoint(p.fRefPoint),
   fLatencyL1(p.fLatencyL1),  
-  fLatencyHPTDC(p.fLatencyHPTDC),      
+  fLatencyL1A(p.fLatencyL1A),  
+  fLatencyL1C(p.fLatencyL1C),  
+ fLatencyHPTDC(p.fLatencyHPTDC),      
   fVertexShift(p.fVertexShift)   
 {
  
@@ -91,6 +95,9 @@ AliT0RecoParam& AliT0RecoParam:: operator=(const AliT0RecoParam &p)
   fRefAmp = p.fRefAmp;
   fRefPoint = p.fRefPoint;
   fLatencyL1 = p.fLatencyL1;
+  fLatencyL1A = p.fLatencyL1A;
+  fLatencyL1C = p.fLatencyL1C;
+
   fLatencyHPTDC = p.fLatencyHPTDC;
   fVertexShift = p.fVertexShift;
   return *this;
@@ -106,7 +113,9 @@ AliT0RecoParam *AliT0RecoParam::GetLowFluxParam()
   AliT0RecoParam *param = new AliT0RecoParam();
   param->fRefAmp = 1;
   param->fRefPoint = 0;
-  param->fLatencyL1 = 7782.01;
+  param->fLatencyL1 = 7782.05;
+  param->fLatencyL1A = 7781.90;
+  param->fLatencyL1C =  7782.19;
   param->fLatencyHPTDC = 22000;
   param->fVertexShift = 4.6;
   for (Int_t i=0; i<500; i++)
@@ -128,10 +137,13 @@ AliT0RecoParam *AliT0RecoParam::GetHighFluxParam()
   //
 
   AliT0RecoParam *param = new AliT0RecoParam();
-  param->fRefAmp = 5;
+  param->fRefAmp = 10;
   param->fRefPoint = 0;
-  param->fLatencyL1 = 7782.01;
+  param->fLatencyL1 = 7782.05;
+  param->fLatencyL1A = 7781.90;
+  param->fLatencyL1C =  7782.19;
   param->fLatencyHPTDC = 22000;
+
   param->fVertexShift = 4.6;
   for (Int_t i=0; i<500; i++)
     {
@@ -155,8 +167,11 @@ AliT0RecoParam *AliT0RecoParam::GetLaserTestParam()
   AliT0RecoParam *param = new AliT0RecoParam();
   param->fRefAmp = 1;
   param->fRefPoint = 1;
-  param->fLatencyL1 = 7782.01;
+  param->fLatencyL1 = 7782.05;
+  param->fLatencyL1A = 7781.90;
+  param->fLatencyL1C =  7782.19;
   param->fLatencyHPTDC = 22000;
+
   param->fVertexShift = 0;
   for (Int_t i=0; i<500; i++)
     {
@@ -179,6 +194,6 @@ void AliT0RecoParam::PrintParameters() const
   AliInfo(Form(" Reference point in channel  : %i", fRefPoint));
   AliInfo(Form(" Current latency  : %i ns", fLatencyL1));
   AliInfo(Form(" HPTDC latency  : %i ns", fLatencyHPTDC));
-  cout<<" AliT0RecoParam::PrintParameters() "<<endl;
-  for (Int_t i=0; i<500; i++) cout<<i<<" "<<fLow[i]<<" "<<fHigh[i]<<endl; 
+  //  cout<<" AliT0RecoParam::PrintParameters() "<<endl;
+  //  for (Int_t i=0; i<500; i++) cout<<i<<" "<<fLow[i]<<" "<<fHigh[i]<<endl; 
 }
index 8ec8cac3e1ed263a027cc1d8bd18a28d614af096..d42c89ce76950413b60f47b9d204e5992c6446c1 100644 (file)
@@ -41,6 +41,10 @@ class AliT0RecoParam : public AliDetectorRecoParam
   
   Float_t   GetLatencyL1() const {return fLatencyL1;}
   void      SetLatencyL1(Float_t lat) {fLatencyL1 = lat;}
+  Float_t   GetLatencyL1A() const {return fLatencyL1A;}
+  void      SetLatencyL1A(Float_t lat) {fLatencyL1A = lat;}
+  Float_t   GetLatencyL1C() const {return fLatencyL1C;}
+  void      SetLatencyL1C(Float_t lat) {fLatencyL1C = lat;}
   Float_t   GetLatencyHPTDC() const {return fLatencyHPTDC;}
   void      SetLatencyHPTDC(Float_t lat) {fLatencyHPTDC = lat;}
   Float_t   GetVertexShift() const {return fVertexShift;}
@@ -54,10 +58,12 @@ class AliT0RecoParam : public AliDetectorRecoParam
   Float_t   fLow[500];          //low limit of monitoring histograms
   Float_t   fHigh[500];         //high limit of monitoring histograms
   Float_t   fLatencyL1;         //Latency L1
+  Float_t   fLatencyL1A;         //Latency L1 for OrA
+  Float_t   fLatencyL1C;         //Latency L1 for orC
   Float_t   fLatencyHPTDC;      //Latency HPTDC
   Float_t   fVertexShift;       // for slewing correcton
 
-  ClassDef(AliT0RecoParam, 3);
+  ClassDef(AliT0RecoParam, 4);
  
 };
 #endif
index 3e98e449451a75dd956622cb39b6163107c6de41..628093f2d68816dffd57375aa76e87409d3dca0f 100644 (file)
@@ -223,9 +223,11 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
   Int_t refAmp = GetRecoParam()->GetRefAmp();
   Int_t refPoint = GetRecoParam()->GetRefPoint();
   Float_t latencyL1 = GetRecoParam()->GetLatencyL1();
+  Float_t latencyL1A = GetRecoParam()->GetLatencyL1A();
+  Float_t latencyL1C = GetRecoParam()->GetLatencyL1C();
   Float_t latencyHPTDC = GetRecoParam()->GetLatencyHPTDC();
   Float_t vertexshift = GetRecoParam()->GetVertexShift();
-
+  AliDebug(10,Form(" LatencyL1 %f latencyL1A %f latencyL1C %f latencyHPTDC %f \n",latencyL1,latencyL1A,latencyL1C, latencyHPTDC));
   Int_t allData[110][5];
   
   Int_t timeCFD[24], timeLED[24], chargeQT0[24], chargeQT1[24];
@@ -243,7 +245,8 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
   Double32_t besttimeC=9999999;
   Int_t pmtBestA=99999;
   Int_t pmtBestC=99999;
-  Float_t meanVertex = fParam->GetMeanVertex();
+  // Float_t meanVertex = fParam->GetMeanVertex();
+  Float_t meanVertex = 0;
    
   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
   
@@ -352,14 +355,14 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
         }
        }
        if(besttimeA < 999999) 
-        frecpoints->SetTimeBestA( 0.001 * besttimeA * channelWidth - latencyHPTDC + latencyL1);
+        frecpoints->SetTimeBestA(0.001* besttimeA * channelWidth - latencyHPTDC + latencyL1A);
        if( besttimeC < 999999 ) 
-        frecpoints->SetTimeBestC(0.001 * besttimeC * channelWidth - latencyHPTDC + latencyL1);
+        frecpoints->SetTimeBestC( 0.001 *besttimeC * channelWidth - latencyHPTDC + latencyL1C);
        AliDebug(10,Form(" pmtA %i besttimeA %f ps, pmtC %i besttimeC %f ps",
                       pmtBestA,besttimeA, pmtBestC,  besttimeC));
         if(besttimeA <999999 && besttimeC < 999999 ){
         timeDiff = ( besttimeA - besttimeC) *0.001 * channelWidth;
-        timeclock =  0.001 * channelWidth * Float_t(besttimeA+besttimeC)/2. - latencyHPTDC + latencyL1;  
+        timeclock = 0.001*channelWidth * Float_t( besttimeA+besttimeC)/2. - latencyHPTDC + latencyL1;  
         meanTime = (besttimeA+besttimeC-2.*Float_t(ref))/2.;
         vertex =  meanVertex -  c*(timeDiff)/2. + vertexshift; //+ (fdZonA - fdZonC)/2; 
        }