Multiplicities in VZERO are now float numbers (in units of MIP) (Brigitte)

diff --git a/STEER/AliESDVZERO.cxx b/STEER/AliESDVZERO.cxx
index 5ffa0b3a0ef6ea1500db793cdf328f234c7eba47..450ef53545ff792a304469a6785eee5433773720 100644 (file)
--- a/STEER/AliESDVZERO.cxx
+++ b/STEER/AliESDVZERO.cxx
@@ -13,7 +13,7 @@ AliESDVZERO::AliESDVZERO()
 {   
    // Default constructor 
    for(Int_t j=0; j<64; j++){ 
-      fMultiplicity[j] = 0;   
+      fMultiplicity[j] = 0.0;   
       fAdc[j]   = 0;   
       fTime[j]  = 0; 
       fWidth[j] = 0; 
@@ -44,7 +44,7 @@ AliESDVZERO::AliESDVZERO(const AliESDVZERO &o)
 //__________________________________________________________________________
 AliESDVZERO::AliESDVZERO(UInt_t BBtriggerV0A, UInt_t BGtriggerV0A,
              UInt_t BBtriggerV0C, UInt_t BGtriggerV0C,
-             Short_t *Multiplicity, Short_t *Adc, 
+             Float_t *Multiplicity, Short_t *Adc, 
              Short_t *Time, Short_t *Width, Bool_t *BBFlag, Bool_t *BGFlag)
   :TObject(),
    fBBtriggerV0A(BBtriggerV0A),
@@ -105,71 +105,71 @@ Short_t AliESDVZERO::GetNbPMV0C()
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMTotV0A()
+Float_t AliESDVZERO::GetMTotV0A()
 {
-  Int_t n=0;
+  Float_t mul=0.0;
   for(Int_t i=32;i<64;i++) 
-    n+= (Int_t) fMultiplicity[i];
-  return n;
+    mul+= (Float_t) fMultiplicity[i];
+  return mul;
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMTotV0C()
+Float_t AliESDVZERO::GetMTotV0C()
 {
-  Int_t n=0;
+  Float_t mul=0.0;
   for(Int_t i=0;i<32;i++) 
-    n+= (Int_t) fMultiplicity[i];
-  return n;
+    mul+= (Float_t) fMultiplicity[i];
+  return mul;
 }
 
 //__________________________________________________________________________
-Int_t* AliESDVZERO::GetMRingV0A()
+Float_t* AliESDVZERO::GetMRingV0A()
 {
 //  cout << "AliESDVZERO::GetMRingV0C() not supported any more" << endl;
 //  cout << "use Int_t AliESDVZERO::GetMRingV0C(Int_t ring)" << endl;
   AliInfo("AliESDVZERO::GetMRingV0C() not supported any more");
-  AliInfo("use Int_t AliESDVZERO::GetMRingV0C(Int_t ring)");
+  AliInfo("use Float_t AliESDVZERO::GetMRingV0C(Int_t ring)");
   return 0x0;
 }
 
 //__________________________________________________________________________
-Int_t* AliESDVZERO::GetMRingV0C()
+Float_t* AliESDVZERO::GetMRingV0C()
 {
 //  cout << "AliESDVZERO::GetMRingV0C() not supported any more" << endl;
 //  cout << "use Int_t AliESDVZERO::GetMRingV0C(Int_t ring)" << endl;
   AliInfo("AliESDVZERO::GetMRingV0C() not supported any more");
-  AliInfo("use Int_t AliESDVZERO::GetMRingV0C(Int_t ring)"); 
+  AliInfo("use Float_t AliESDVZERO::GetMRingV0C(Int_t ring)"); 
   return 0x0;
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMRingV0A(Int_t ring)
+Float_t AliESDVZERO::GetMRingV0A(Int_t ring)
 { 
   if (OutOfRange(ring, "AliESDVZERO:::GetMRingV0A",4)) return -1;
-  Int_t n=0;
+  Float_t mul =0.0;
 
-  if (ring == 0) for(Int_t i=32;i<40;i++) n += (Int_t) fMultiplicity[i];
-  if (ring == 1) for(Int_t i=40;i<48;i++) n += (Int_t) fMultiplicity[i];
-  if (ring == 2) for(Int_t i=48;i<56;i++) n += (Int_t) fMultiplicity[i];
-  if (ring == 3) for(Int_t i=56;i<64;i++) n += (Int_t) fMultiplicity[i];
-  return n ;
+  if (ring == 0) for(Int_t i=32;i<40;i++) mul += (Float_t) fMultiplicity[i];
+  if (ring == 1) for(Int_t i=40;i<48;i++) mul += (Float_t) fMultiplicity[i];
+  if (ring == 2) for(Int_t i=48;i<56;i++) mul += (Float_t) fMultiplicity[i];
+  if (ring == 3) for(Int_t i=56;i<64;i++) mul += (Float_t) fMultiplicity[i];
+  return mul ;
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMRingV0C(Int_t ring)
+Float_t AliESDVZERO::GetMRingV0C(Int_t ring)
 { 
   if (OutOfRange(ring, "AliESDVZERO:::GetMRingV0C",4)) return -1;
-  Int_t n=0;
+  Float_t mul =0.0;
 
-  if (ring == 0) for(Int_t i=0;i<8;i++)   n += (Int_t) fMultiplicity[i];
-  if (ring == 1) for(Int_t i=8;i<16;i++)  n += (Int_t) fMultiplicity[i];
-  if (ring == 2) for(Int_t i=16;i<24;i++) n += (Int_t) fMultiplicity[i];
-  if (ring == 3) for(Int_t i=24;i<32;i++) n += (Int_t) fMultiplicity[i];
-  return n ;
+  if (ring == 0) for(Int_t i=0;i<8;i++)   mul += (Float_t) fMultiplicity[i];
+  if (ring == 1) for(Int_t i=8;i<16;i++)  mul += (Float_t) fMultiplicity[i];
+  if (ring == 2) for(Int_t i=16;i<24;i++) mul += (Float_t) fMultiplicity[i];
+  if (ring == 3) for(Int_t i=24;i<32;i++) mul += (Float_t) fMultiplicity[i];
+  return mul ;
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMultiplicity(Int_t i)
+Float_t AliESDVZERO::GetMultiplicity(Int_t i)
 
 {
   if (OutOfRange(i, "AliESDVZERO::GetMultiplicity:",64)) return -1;
@@ -177,7 +177,7 @@ Int_t AliESDVZERO::GetMultiplicity(Int_t i)
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMultiplicityV0A(Int_t i)
+Float_t AliESDVZERO::GetMultiplicityV0A(Int_t i)
 
 {
   if (OutOfRange(i, "AliESDVZERO::GetMultiplicityV0A:",32)) return -1;
@@ -185,7 +185,7 @@ Int_t AliESDVZERO::GetMultiplicityV0A(Int_t i)
 }
 
 //__________________________________________________________________________
-Int_t AliESDVZERO::GetMultiplicityV0C(Int_t i)
+Float_t AliESDVZERO::GetMultiplicityV0C(Int_t i)
 
 {
   if (OutOfRange(i, "AliESDVZERO::GetMultiplicityV0C:",32)) return -1;

diff --git a/STEER/AliESDVZERO.h b/STEER/AliESDVZERO.h
index c817e862e074d3d5fc38c8ef3ead96cf1f68571b..fcdc03bfab139adfd47f22c6ed50b4fe587f26f7 100644 (file)
--- a/STEER/AliESDVZERO.h
+++ b/STEER/AliESDVZERO.h
@@ -10,7 +10,7 @@ public:
   AliESDVZERO(const AliESDVZERO&);
   AliESDVZERO(UInt_t BBtriggerV0A,   UInt_t BGtriggerV0A,
              UInt_t BBtriggerV0C,   UInt_t BGtriggerV0C,
-             Short_t *Multiplicity, Short_t *Adc, 
+             Float_t *Multiplicity, Short_t *Adc, 
              Short_t *Time, Short_t *Width, Bool_t *BBFlag, Bool_t *BGFlag);
 
   virtual ~AliESDVZERO() {};
@@ -20,7 +20,7 @@ public:
   virtual void SetBGtriggerV0A(UInt_t BGtrigger) {fBGtriggerV0A=BGtrigger;}
   virtual void SetBBtriggerV0C(UInt_t BBtrigger) {fBBtriggerV0C=BBtrigger;}
   virtual void SetBGtriggerV0C(UInt_t BGtrigger) {fBGtriggerV0C=BGtrigger;}
-  virtual void SetMultiplicity(Short_t Multiplicity[64])
+  virtual void SetMultiplicity(Float_t Multiplicity[64])
     {for(Int_t i=0;i<64;i++) fMultiplicity[i]=Multiplicity[i];}
   virtual void SetADC(Short_t adc[64])
     {for(Int_t i=0;i<64;i++) fAdc[i]=adc[i];}
@@ -34,33 +34,33 @@ public:
     {for(Int_t i=0;i<64;i++) fBGFlag[i]=BGFlag[i];}   
          
   // Getters  
-  Short_t GetNbPMV0A();
-  Short_t GetNbPMV0C();
-  Int_t   GetMTotV0A();
-  Int_t   GetMTotV0C(); 
-  Int_t*  GetMRingV0A();
-  Int_t*  GetMRingV0C();
-  Int_t   GetMRingV0A(Int_t ring);
-  Int_t   GetMRingV0C(Int_t ring);
+  Short_t  GetNbPMV0A();
+  Short_t  GetNbPMV0C();
+  Float_t  GetMTotV0A();
+  Float_t  GetMTotV0C(); 
+  Float_t* GetMRingV0A();
+  Float_t* GetMRingV0C();
+  Float_t  GetMRingV0A(Int_t ring);
+  Float_t  GetMRingV0C(Int_t ring);
 
-  Int_t   GetMultiplicity(Int_t i);
-  Int_t   GetMultiplicityV0A(Int_t i);
-  Int_t   GetMultiplicityV0C(Int_t i);    
-  Int_t   GetAdc(Int_t i);
-  Int_t   GetAdcV0A(Int_t i); 
-  Int_t   GetAdcV0C(Int_t i);   
-  Int_t   GetTime(Int_t i);
-  Int_t   GetTimeV0A(Int_t i);   
-  Int_t   GetTimeV0C(Int_t i);    
-  Int_t   GetWidth(Int_t i);
-  Int_t   GetWidthV0A(Int_t i);
-  Int_t   GetWidthV0C(Int_t i);
-  Bool_t  BBTriggerV0A(Int_t i);
-  Bool_t  BGTriggerV0A(Int_t i);
-  Bool_t  BBTriggerV0C(Int_t i);
-  Bool_t  BGTriggerV0C(Int_t i);  
-  Bool_t  GetBBFlag(Int_t i);
-  Bool_t  GetBGFlag(Int_t i);
+  Float_t  GetMultiplicity(Int_t i);
+  Float_t  GetMultiplicityV0A(Int_t i);
+  Float_t  GetMultiplicityV0C(Int_t i);    
+  Int_t    GetAdc(Int_t i);
+  Int_t    GetAdcV0A(Int_t i); 
+  Int_t    GetAdcV0C(Int_t i);   
+  Int_t    GetTime(Int_t i);
+  Int_t    GetTimeV0A(Int_t i);   
+  Int_t    GetTimeV0C(Int_t i);    
+  Int_t    GetWidth(Int_t i);
+  Int_t    GetWidthV0A(Int_t i);
+  Int_t    GetWidthV0C(Int_t i);
+  Bool_t   BBTriggerV0A(Int_t i);
+  Bool_t   BGTriggerV0A(Int_t i);
+  Bool_t   BBTriggerV0C(Int_t i);
+  Bool_t   BGTriggerV0C(Int_t i);  
+  Bool_t   GetBBFlag(Int_t i);
+  Bool_t   GetBGFlag(Int_t i);
   
   Bool_t OutOfRange(Int_t i, const char *s, Int_t upper) const;
   AliESDVZERO &operator=(const AliESDVZERO& source);
@@ -72,14 +72,14 @@ protected:
   UInt_t  fBBtriggerV0C;     // bit mask for Beam-Beam trigger in V0C
   UInt_t  fBGtriggerV0C;     // bit mask for Beam-Gas trigger in V0C
 
-  Short_t fMultiplicity[64]; //  multiplicity for each channel
+  Float_t fMultiplicity[64]; //  multiplicity for each channel
   Short_t fAdc[64];          //  adc for each channel
   Short_t fTime[64];         //  time for each channel
   Short_t fWidth[64];        //  time width for each channel
   Bool_t  fBBFlag[64];       //  BB Flags from Online V0 Electronics
   Bool_t  fBGFlag[64];       //  BG Flags from Online V0 Electronics
   
-  ClassDef(AliESDVZERO,5)
+  ClassDef(AliESDVZERO,6)
 };
 
 #endif

diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx
index 2b4b0054cd16c2b666386c6a95f109e00e1e8314..f056b6eab04a02d4aeb5f19b3586ca11403714b5 100644 (file)
--- a/VZERO/AliVZEROReconstructor.cxx
+++ b/VZERO/AliVZEROReconstructor.cxx
@@ -178,7 +178,6 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,
   TBranch* digitBranch = digitsTree->GetBranch("VZERODigit");
   digitBranch->SetAddress(&digitsArray);
 
-  Short_t Multiplicity[64];
   Float_t   mult[64];  
   Short_t    adc[64]; 
   Short_t   time[64]; 
@@ -225,10 +224,8 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,
         }          
     } // end of loop over digits
   } // end of loop over events in digits tree
-  
-  for (Int_t j=0; j<64; j++) Multiplicity[j] = short(mult[j]+0.5); 
-        
-  fESDVZERO->SetMultiplicity(Multiplicity);
+         
+  fESDVZERO->SetMultiplicity(mult);
   fESDVZERO->SetADC(adc);
   fESDVZERO->SetTime(time);
   fESDVZERO->SetWidth(width);