]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Pedestal suppression implemented
authorcheynis <cheynis@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 14 Apr 2008 15:40:07 +0000 (15:40 +0000)
committercheynis <cheynis@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 14 Apr 2008 15:40:07 +0000 (15:40 +0000)
VZERO/AliVZEROReconstructor.cxx

index 1d345a8cc8c7da7acc1de938c187c683ba0005c9..d0d22b8f676569f224fb7268fa26200b459306b5 100644 (file)
@@ -73,6 +73,13 @@ void AliVZEROReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
 {
 // converts to digits
 
+//  retrieval of calibration information 
+//  Float_t     adc_pedestal[128],adc_sigma[128];
+//  for(Int_t  i=0; i<128; i++){ adc_pedestal[i] = fCalibData->GetPedestal(i); 
+//                               adc_sigma[i]    = fCalibData->GetSigma(i);                            
+//                               printf(" i = %d pedestal = %f sigma = %f \n\n", 
+//                                        i, adc_pedestal[i], adc_sigma[i] );} 
+              
   if (!digitsTree) {
     AliError("No digits tree!");
     return;
@@ -85,10 +92,14 @@ void AliVZEROReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
   AliVZERORawStream rawStream(rawReader);
   if (rawStream.Next()) {
     for(Int_t iChannel = 0; iChannel < 64; iChannel++) {
-    Int_t adc = rawStream.GetADC(iChannel);  
-    Int_t time = rawStream.GetTime(iChannel);
-    new ((*digitsArray)[digitsArray->GetEntriesFast()])
-      AliVZEROdigit(iChannel,adc,time);
+        Int_t adc;
+        if(!rawStream.GetIntegratorFlag(iChannel,10))
+           {adc = rawStream.GetADC(iChannel) - Int_t(fCalibData->GetPedestal(iChannel));} //even integrator
+       else 
+          {adc = rawStream.GetADC(iChannel) - Int_t(fCalibData->GetPedestal(iChannel+64));} // odd
+        Int_t time = rawStream.GetTime(iChannel);
+        if (adc >=0) new ((*digitsArray)[digitsArray->GetEntriesFast()])
+                     AliVZEROdigit(iChannel,adc,time);
     }
   }
 
@@ -105,7 +116,7 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,
     AliError("No digits tree!");
     return;
   }
-
+  
   TClonesArray* digitsArray = NULL;
   TBranch* digitBranch = digitsTree->GetBranch("VZERODigit");
   digitBranch->SetAddress(&digitsArray);
@@ -183,8 +194,8 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,
   fESDVZERO->SetMRingV0C(mRingV0C);
   
   if (esd) { 
-    AliDebug(1, Form("Writing VZERO data to ESD tree"));
-    esd->SetVZEROData(fESDVZERO);
+      AliDebug(1, Form("Writing VZERO data to ESD tree"));
+      esd->SetVZEROData(fESDVZERO);
   }
 }