Skip to content

Commit

Permalink
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Browse files Browse the repository at this point in the history
  • Loading branch information
pluettig committed Oct 20, 2014
2 parents 448a7d1 + 4469fdb commit 83d1b7f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions STEER/AOD/AliAODZDC.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ AliAODZDC::AliAODZDC() :
fImpactParamSideC(0),
fZDCTDCSum(0),
fZDCTDCDifference(0),
fZNCTDC(0),
fZNATDC(0)
fZNCTDC(-999.),
fZNATDC(-999.)
{
// Default constructor
for(Int_t i=0; i<5; i++){
Expand Down
6 changes: 3 additions & 3 deletions STEER/ESD/AliESDZDC.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,18 @@ class AliESDZDC: public AliVZDC {
Float_t GetZDCTDCCorrected(Int_t i, Int_t j) const
{
if(AliESDZDC::kCorrectedTDCFilled && (fZDCTDCData[i][j]!=0)) return fZDCTDCCorrected[i][j];
else return 0.;
else return 999.;
}

Float_t GetZNTDCSum(Int_t ihit) const
{
if(ihit<4 && AliESDZDC::kCorrectedTDCFilled && (fZDCTDCData[10][ihit]!=0) && (fZDCTDCData[12][ihit]!=0)) return (Float_t) (fZDCTDCCorrected[10][ihit]+fZDCTDCCorrected[12][ihit]);
else return 0.;
else return 999.;
}
Float_t GetZNTDCDiff(Int_t ihit) const
{
if(ihit<4 && AliESDZDC::kCorrectedTDCFilled && (fZDCTDCData[10][ihit]!=0) && (fZDCTDCData[12][ihit]!=0)) return (Float_t) (fZDCTDCCorrected[12][ihit]-fZDCTDCCorrected[10][ihit]);
else return 0.;
else return 999.;
}

virtual Float_t GetZDCTimeSum() const
Expand Down

0 comments on commit 83d1b7f

Please sign in to comment.