Modified the way the shift in the primaries list is done in case of event mixing

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index 9b624fa6f0f440a3cafae7dfcd8539d85d3eda16..dd21e8089840efa78d72a0406c2a059fe925f652 100644 (file)
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -45,7 +45,6 @@ ClassImp(AliPHOSDigit)
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
   fNMaxPrimary = 5 ; 
-  fShiftOffset = 10000000 ;
 }
 
 //____________________________________________________________________________
@@ -58,7 +57,6 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim
   fTime        = time ;
   fId          = id ;
   fIndexInList = index ; 
-  fShiftOffset = 10000000 ;
   if( primary != -1){
     fNprimary    = 1 ; 
     fPrimary[0]  = primary ;
@@ -80,7 +78,6 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit)
 
   fNMaxPrimary = digit.fNMaxPrimary ;  
   Int_t i ;
-  fShiftOffset = 10000000 ;
   for ( i = 0; i < fNMaxPrimary ; i++)
     fPrimary[i]  = digit.fPrimary[i] ;
   fAmp         = digit.fAmp ;
@@ -143,7 +140,7 @@ void AliPHOSDigit::ShiftPrimary(Int_t shift)
   //shifts primary number to BIG offset, to separate primary in different TreeK
   Int_t index  ;
   for(index = 0; index <fNprimary; index ++ ){
-    fPrimary[index] = fPrimary[index]+ shift * fShiftOffset ;
+    fPrimary[index] = fPrimary[index]+ shift ;
   } 
 }
 //____________________________________________________________________________

diff --git a/PHOS/AliPHOSDigit.h b/PHOS/AliPHOSDigit.h
index 576ad0b80434c5539d5de7301e49f907ff83821e..ca9348ee9e12f07c26832e551af84f6ffffda2d3 100644 (file)
--- a/PHOS/AliPHOSDigit.h
+++ b/PHOS/AliPHOSDigit.h
@@ -60,7 +60,6 @@ class AliPHOSDigit : public AliDigitNew {
   Int_t fNprimary ;         // Number of primaries
   Int_t fNMaxPrimary ;      //! Max Number of primaries
   Int_t fPrimary[5] ;       // Array of primaries      
-  Int_t fShiftOffset ;      // offset to be applied to the primary article numbering in case of event mixing
   Float_t fTime ;           // Calculcated time 
     
   ClassDef(AliPHOSDigit,1)   // Digit in PHOS 

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index c4c097afc727af81b641d751a8667dc4a14cdce4..6580fb6e6796bf95d459dc5b488c69964636f08f 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -235,8 +235,8 @@ void AliPHOSDigitizer::Digitize(const Int_t event)
          if(fManager)
            primaryoffset = fManager->GetMask(i) ; 
          else
-           primaryoffset = i ;
-         curSDigit->ShiftPrimary(i) ;
+           primaryoffset = 10000000*i ;
+         curSDigit->ShiftPrimary(primaryoffset) ;
          
          a = curSDigit->GetAmp() ;
          b = a /fTimeSignalLength ;