Added graphical reference to help DQM shifter. Updated sim TOF QA histograms. (F...

[u/mrichter/AliRoot.git] / VZERO / AliVZERO.cxx

diff --git a/VZERO/AliVZERO.cxx b/VZERO/AliVZERO.cxx
index 10dd35881c840afd090ab224a759ce4a71e144c1..947d88fa82d214f2f96514bde79d483620706da7 100755 (executable)
--- a/VZERO/AliVZERO.cxx
+++ b/VZERO/AliVZERO.cxx
@@ -125,14 +125,6 @@ AliVZERO::~AliVZERO()
         fDigits=0; }
 }
 
-//_____________________________________________________________________________
-void AliVZERO::BuildGeometry()
-{
-  //
-  // Builds simple ROOT TNode geometry for event display
-  //
-}
- 
 //_____________________________________________________________________________
 void AliVZERO::CreateGeometry()
 {
@@ -148,17 +140,6 @@ void AliVZERO::CreateMaterials()
   //
 }
 
-//_____________________________________________________________________________
-Int_t AliVZERO::DistanceToPrimitive(Int_t /*px*/, Int_t /*py*/)
-{
-  //
-  // Calculates the distance from the mouse to the VZERO on the screen
-  // Dummy routine
-  //
-  
-  return 9999;
-}
- 
 //_____________________________________________________________________________
 void AliVZERO::Init()
 {
@@ -319,9 +300,10 @@ void AliVZERO::Digits2Raw()
    // digits!!
 
    Int_t nEntries = Int_t(digits->GetEntries());
-   UInt_t ADC[64];
+   Float_t ADC[64];
    Int_t PMNumber[64];
-   UInt_t Time[64];
+   Float_t Time[64];
+   Bool_t Integrator[64];
   
    for (Int_t i = 0; i < nEntries; i++) {
      fVZERO->ResetDigits();
@@ -331,16 +313,19 @@ void AliVZERO::Digits2Raw()
      if(ndig == 0) continue;
      if(verbose == 2) {ftxt.open("VZEROdigits.txt",ios::app);}
      for(Int_t k=0; k<ndig; k++){
-         AliVZEROdigit* fVZERODigit = (AliVZEROdigit*) VZEROdigits->At(k);                     
-        ADC[k]       = (UInt_t) fVZERODigit->ADC();
-        PMNumber[k]  = fVZERODigit->PMNumber();
-        Time[k]      = (UInt_t) fVZERODigit->Time();
+         AliVZEROdigit* fVZERODigit = (AliVZEROdigit*) VZEROdigits->At(k);
+         // Convert aliroot channel k into FEE channel iChannel before writing data
+        Int_t iChannel      = buffer->GetOnlineChannel(k);             
+        ADC[iChannel]       = fVZERODigit->ADC();
+        PMNumber[iChannel]  = fVZERODigit->PMNumber();
+        Time[iChannel]      = fVZERODigit->Time();
+        Integrator[iChannel]= fVZERODigit->Integrator(); 
          if(verbose == 1) { cout <<"DDL: "<<fileName<< "\tdigit number: "<< k<<"\tPM number: "
                            <<PMNumber[k]<<"\tADC: "<< ADC[k] << "\tTime: "<< Time[k] << endl;} 
         if(verbose == 2) {
              ftxt<<"DDL: "<<fileName<< "\tdigit number: "<< k<<"\tPM number: "
                           <<PMNumber[k]<<"\tADC: "<< ADC[k] << "\tTime: "<< Time[k] << endl;}        
-//      printf("DDL: %s, channel: %d, PM: %d, ADC: %d, Time: %d \n", 
+//      printf("DDL: %s, channel: %d, PM: %d, ADC: %f, Time: %f \n", 
 //                 fileName,k,PMNumber[k],ADC[k],Time[k]); 
      }        
    if(verbose==2) ftxt.close();
@@ -354,15 +339,16 @@ void AliVZERO::Digits2Raw()
   
       for(Int_t iChannel_Offset = iCIU*8; iChannel_Offset < (iCIU*8)+8; iChannel_Offset=iChannel_Offset+4) { 
          for(Int_t iChannel = iChannel_Offset; iChannel < iChannel_Offset+4; iChannel++) {
-             buffer->WriteChannel(iChannel, ADC[iChannel], Time[iChannel]);       
+             buffer->WriteChannel(iChannel, (Int_t) ADC[iChannel], Time[iChannel], Integrator[iChannel]);       
          }
          buffer->WriteBeamFlags(); 
          buffer->WriteMBInfo(); 
          buffer->WriteMBFlags();   
          buffer->WriteBeamScalers(); 
       } 
-      for(Int_t kChannel = kChannel=0; kChannel < 8; kChannel++) {
-          buffer->WriteTiming(kChannel, ADC[kChannel], Time[kChannel]); 
+//      for(Int_t iChannel=0; iChannel < 8; iChannel++) {
+      for(Int_t iChannel=7; iChannel >= 0; iChannel--) {
+          buffer->WriteTiming(iChannel, (Int_t) ADC[iChannel], Time[iChannel]); 
       }
 
     // End of decoding of one CIU card
@@ -402,14 +388,14 @@ Bool_t AliVZERO::Raw2SDigits(AliRawReader* rawReader){
   if (!rawStream->Next()) return kFALSE; // No VZERO data found
   
   for(Int_t i=0; i<64; i++) {
-      new(pdigit) AliVZEROdigit(i, (Int_t)rawStream->GetADC(i), (Int_t)rawStream->GetTime(i)); 
+      new(pdigit) AliVZEROdigit(i, rawStream->GetADC(i), rawStream->GetTime(i)); 
       treeD->Fill();
   }
  
 // Checks if everything is OK by printing results 
 
 //   for(int i=0;i<64;i++) {
-//     printf("Channel %d : %d %d \n",i,rawStream->GetADC(i),rawStream->GetTime(i)); }
+//     printf("Channel %d : %f %f \n",i,rawStream->GetADC(i),rawStream->GetTime(i)); }
 //   treeD->Print(); printf(" \n"); 
        
   fLoader->WriteDigits("OVERWRITE");
@@ -419,6 +405,7 @@ Bool_t AliVZERO::Raw2SDigits(AliRawReader* rawReader){
 
   timer.Stop();
   timer.Print();
+  return kTRUE;
 }