Scalers moved to ESDZDC (Chiara Oppedisano)

diff --git a/STEER/AliESDEvent.h b/STEER/AliESDEvent.h
index 731b146660ddb88f4606c0bfb46180fd07201890..c715459bd58fbb2f87d67bc01cc23d3ced718001 100644 (file)
--- a/STEER/AliESDEvent.h
+++ b/STEER/AliESDEvent.h
@@ -174,6 +174,7 @@ public:
                 Int_t nPartC, Double_t b, Double_t bA, Double_t bC, UInt_t recoflag)
   {fESDZDC->SetZDC(n1Energy, p1Energy, em1Energy, em2Energy, n2Energy, p2Energy, 
    participants, nPartA, nPartC, b, bA, bC,  recoflag);}
+  void    SetZDCScaler(UInt_t *counts) {fESDZDC->SetZDCScaler(counts);}
 
 
   // FMD

diff --git a/STEER/AliESDZDC.cxx b/STEER/AliESDZDC.cxx
index bf0dc943f36ec23e7a9bb29188a4d79a5ab8068f..f66d79d2a12ba65419e9263c9724f303ad2ca6f3 100644 (file)
--- a/STEER/AliESDZDC.cxx
+++ b/STEER/AliESDZDC.cxx
@@ -53,6 +53,7 @@ AliESDZDC::AliESDZDC() :
   for(Int_t i=0; i<2; i++){
     fZNACentrCoord[i] = fZNCCentrCoord[i] = 0.;
   }
+  for(Int_t i=0; i<32; i++) fVMEScaler[i]=0;
 }
 
 //______________________________________________________________________________
@@ -87,6 +88,7 @@ AliESDZDC::AliESDZDC(const AliESDZDC& zdc) :
     fZNACentrCoord[i] = zdc.fZNACentrCoord[i];
     fZNCCentrCoord[i] = zdc.fZNCCentrCoord[i];
   }
+  for(Int_t i=0; i<32; i++) fVMEScaler[i] = zdc.fVMEScaler[i];
 }
 
 //______________________________________________________________________________
@@ -125,6 +127,7 @@ AliESDZDC& AliESDZDC::operator=(const AliESDZDC&zdc)
     }
     //
     fESDQuality = zdc.fESDQuality;
+    for(Int_t i=0; i<32; i++) fVMEScaler[i] = zdc.fVMEScaler[i];
   } 
   return *this;
 }
@@ -170,6 +173,7 @@ void AliESDZDC::Reset()
        fZNACentrCoord[i] = fZNCCentrCoord[i] = 0.;
   }
   fESDQuality=0;
+  for(Int_t i=0; i<32; i++) fVMEScaler[i] = 0;
 }
 
 //______________________________________________________________________________
@@ -180,6 +184,10 @@ void AliESDZDC::Print(const Option_t *) const
   " E_{ZEM} = %f GeV, Npart = %d, b = %1.2f fm\n",
   fZDCN1Energy/1000.,fZDCP1Energy/1000.,fZDCN2Energy/1000.,fZDCP2Energy/1000.,
   fZDCEMEnergy+fZDCEMEnergy1, fZDCParticipants,fImpactParameter);
+  //
+  printf(" ### fVMEScaler: \n");
+  for(Int_t i=0; i<32; i++) printf("\t datum %d: %d \n",i,fVMEScaler[i]);
+  printf("\n");
 }
 
 //______________________________________________________________________________

diff --git a/STEER/AliESDZDC.h b/STEER/AliESDZDC.h
index 001e5f0a8e932c376dd47454a1aa18d1d9ae3516..2341148b2fbafeae00600a6f3073d73de393d977 100644 (file)
--- a/STEER/AliESDZDC.h
+++ b/STEER/AliESDZDC.h
@@ -9,6 +9,8 @@
 //                      Implementation of   Class AliESDZDC
 //   This is a class that summarizes the ZDC data for the ESD   
 //   Origin: Christian Klein-Boesing, CERN, Christian.Klein-Boesing@cern.ch 
+//   *** 15/10/2009 Scaler added to AliESDZDC class ***
+//   *** Scaler format:  32 floats from VME scaler  ***
 //-------------------------------------------------------------------------
 
 #include <TObject.h>
@@ -82,6 +84,12 @@ public:
   void  SetZNCCentroid(Float_t centrCoord[2])
           {for(Int_t i=0; i<2; i++) fZNCCentrCoord[i] = centrCoord[i];}
 
+  UInt_t GetZDCScaler(Int_t i)  const {return fVMEScaler[i];}
+  const UInt_t* GetZDCScaler()  const {return fVMEScaler;}
+  
+  void SetZDCScaler(UInt_t count[32]) 
+       {for(Int_t k=0; k<32; k++) fVMEScaler[k] = count[k];}
+
   void    Reset();
   void    Print(const Option_t *opt=0) const;
 
@@ -111,7 +119,9 @@ private:
   Double32_t   fZNCCentrCoord[2]; // Coordinates of the centroid over ZNA
   UInt_t       fESDQuality;      // flags from reconstruction
   //
-  ClassDef(AliESDZDC,10)
+  UInt_t fVMEScaler[32]; // counts from VME scaler
+
+  ClassDef(AliESDZDC,11)
 };
 
 #endif

diff --git a/STEER/AliESDZDCScalers.cxx b/STEER/AliESDZDCScalers.cxx
deleted file mode 100644 (file)
index 896038b..0000000
--- a/STEER/AliESDZDCScalers.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-
-//-------------------------------------------------------------------------
-//  This class is used to store data in events where scalers are read
-//   in SOFTWARE_TRIGGER events, no ADC datum filled in such events
-//  Author: Chiara Oppedisano  Chiara.Oppedisano@to.infn.it    
-//-------------------------------------------------------------------------
-
-#include "AliESDZDCScalers.h"
-
-ClassImp(AliESDZDCScalers)
-
-//______________________________________________________________________________
-AliESDZDCScalers::AliESDZDCScalers() :
-  TObject()
-{
-  // constructor
-  for(Int_t i=0; i<2; i++)  fScalerDown[i]=0;
-  for(Int_t i=0; i<8; i++)  fScalerUp[i]=0;
-  for(Int_t i=0; i<32; i++) fVMEScaler[i]=0;
-
-}//______________________________________________________________________________
-AliESDZDCScalers::AliESDZDCScalers(const AliESDZDCScalers& zdc) :
-  TObject(zdc)
-{
-  // copy constructor
-  for(Int_t i=0; i<32; i++){
-     if(i<2) fScalerDown[i] = zdc.fScalerDown[i];
-     if(i<8) fScalerUp[i] = zdc.fScalerUp[i];
-     fVMEScaler[i] = zdc.fVMEScaler[i];
-  }
-}
-
-//______________________________________________________________________________
-AliESDZDCScalers& AliESDZDCScalers::operator=(const AliESDZDCScalers&zdc)
-{
-  // assigment operator
-  if(this!=&zdc) {
-    TObject::operator=(zdc);
-    for(Int_t i=0; i<32; i++){
-       if(i<2) fScalerDown[i] = zdc.fScalerDown[i];
-       if(i<8) fScalerUp[i] = zdc.fScalerUp[i];
-       fVMEScaler[i] = zdc.fVMEScaler[i];
-    }
-  } 
-  return *this;
-}
-
-//______________________________________________________________________________
-void AliESDZDCScalers::Copy(TObject &obj) const {
-  
-  // this overwrites the virtual TOBject::Copy()
-  // to allow run time copying without casting
-  // in AliESDEvent
-
-  if(this==&obj)return;
-  AliESDZDCScalers *robj = dynamic_cast<AliESDZDCScalers*>(&obj);
-  if(!robj)return; // not an AliESDZDCScalers
-  *robj = *this;
-
-}
-
-
-//______________________________________________________________________________
-void AliESDZDCScalers::Reset()
-{
-  // reset all data members
-  for(Int_t i=0; i<32; i++){
-     if(i<2) fScalerDown[i] = 0;
-     if(i<8) fScalerUp[i] = 0;
-     fVMEScaler[i] = 0;
-  }
-}
-
-//______________________________________________________________________________
-void AliESDZDCScalers::Print(const Option_t *) const
-{
-  //  Print ESD scaler events for the ZDC
-  printf("\n");
-  for(Int_t i=0; i<2; i++) printf("\tfScalerDown[%d] = %d \n",i,fScalerDown[i]);
-  for(Int_t i=0; i<8; i++) printf("\tfScalerUp[%d] = %d \n",i,fScalerUp[i]);
-  for(Int_t i=0; i<32; i++) printf("\tfVMEScaler[%d] = %d \n",i,fVMEScaler[i]);
-  printf("\n");
-}

diff --git a/STEER/AliESDZDCScalers.h b/STEER/AliESDZDCScalers.h
deleted file mode 100644 (file)
index a316069..0000000
--- a/STEER/AliESDZDCScalers.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef ALIESDZDCSCALERS_H
-#define ALIESDZDCSCALERS_H
-
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-//-------------------------------------------------------------------------
-//  This class is used to store data in events where scalers are read
-//  Scaler format: 1(in)+1(out) floats from Benotto's card downstairs
-//                4(in)+4(out) floats from Benotto's card upstairs
-//                32 floats from VME scaler
-//-------------------------------------------------------------------------
-
-#include <TObject.h>
-#include <TMath.h>
-
-
-class AliESDZDCScalers: public TObject {
-
-public:
-  AliESDZDCScalers();
-  AliESDZDCScalers(const AliESDZDCScalers& zdc);
-  AliESDZDCScalers& operator=(const AliESDZDCScalers& zdc);
-  virtual void Copy(TObject &obj) const;
-  
-  UInt_t GetScalerDown(Int_t i) const {return fScalerDown[i];}
-  UInt_t GetScalerUp(Int_t i)   const {return fScalerUp[i];}
-  UInt_t GetVMEScaler(Int_t i)  const {return fVMEScaler[i];}
-  const UInt_t* GetScalerDown() const {return fScalerDown;}
-  const UInt_t* GetScalerUp()   const {return fScalerUp;}
-  const UInt_t* GetVMEScaler()  const {return fVMEScaler;}
-  
-  void SetScalerDown(UInt_t count[2]) 
-       {for(Int_t k=0; k<2; k++) fScalerDown[k] = count[k];}
-  void SetScalerUp(UInt_t count[8]) 
-       {for(Int_t k=0; k<8; k++) fScalerUp[k] = count[k];}
-  void SetVMEScaler(UInt_t count[32]) 
-       {for(Int_t k=0; k<32; k++) fVMEScaler[k] = count[k];}
-
-  void    Reset();
-  void    Print(const Option_t *opt=0) const;
-
-private:
-  UInt_t fScalerDown[2]; // counts from Benotto's card downstairs
-  UInt_t fScalerUp[8];   // counts from Benotto's card upstairs
-  UInt_t fVMEScaler[32]; // counts from VME scaler
-
-  ClassDef(AliESDZDCScalers,1)
-  
-};
-
-#endif

diff --git a/STEER/CMake_libESD.txt b/STEER/CMake_libESD.txt
index 8cae8c51909d16dc82b2702eb886b8fb6e8a6ece..2c39226f29316973eeaa93dfcd56e73fc6b73dca 100644 (file)
--- a/STEER/CMake_libESD.txt
+++ b/STEER/CMake_libESD.txt
@@ -32,7 +32,6 @@ set(SRCS
        AliTOFpidESD.cxx
        AliTriggerScalersESD.cxx
        AliTriggerScalersRecordESD.cxx 
-       AliESDZDCScalers.cxx
 )
 
 # fill list of header files from list of source files

diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h
index c79fa1b9d2da43ddb1bdbe19a2bc2115460b4800..2b82e53749da25ea9aef0765bde5bb58d29a7ed0 100644 (file)
--- a/STEER/ESDLinkDef.h
+++ b/STEER/ESDLinkDef.h
@@ -81,7 +81,6 @@
 
 #pragma link C++ class  AliTriggerScalersESD+;
 #pragma link C++ class  AliTriggerScalersRecordESD+;
-#pragma link C++ class  AliESDZDCScalers+;
 
 #pragma link C++ function operator*(const AliFMDMap&,const AliFMDMap&);
 #pragma link C++ function operator/(const AliFMDMap&,const AliFMDMap&);

diff --git a/STEER/libESD.pkg b/STEER/libESD.pkg
index 12a6875daf04c04aa037e028f61dcb0132486a56..09e812239fe0f7c870874bdc1b5951439b57a5eb 100644 (file)
--- a/STEER/libESD.pkg
+++ b/STEER/libESD.pkg
@@ -30,8 +30,7 @@ SRCS = AliESDEvent.cxx AliESDInputHandler.cxx AliESDInputHandlerRP.cxx AliESDfri
        AliTPCpidESD.cxx \
        AliTOFpidESD.cxx \
        AliTriggerScalersESD.cxx \
-       AliTriggerScalersRecordESD.cxx \
-       AliESDZDCScalers.cxx
+       AliTriggerScalersRecordESD.cxx
 
 HDRS:= $(SRCS:.cxx=.h)