X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FESD%2FAliESDCaloTrigger.cxx;h=69af427a37d6706c5cce887093b86347ba84431e;hb=3579964386bd6d4daebb9325221d330edfb06656;hp=5f30acc4a775f87389d6bcfe6a3d5d2ae7ea37f3;hpb=c7d569c0b58606eae9129b9b2c3f20ebdb564889;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/ESD/AliESDCaloTrigger.cxx b/STEER/ESD/AliESDCaloTrigger.cxx
index 5f30acc4a77..69af427a37d 100644
--- a/STEER/ESD/AliESDCaloTrigger.cxx
+++ b/STEER/ESD/AliESDCaloTrigger.cxx
@@ -31,7 +31,7 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 ClassImp(AliESDCaloTrigger)
 
 //_______________
-AliESDCaloTrigger::AliESDCaloTrigger() : TNamed(),
+AliESDCaloTrigger::AliESDCaloTrigger() : AliVCaloTrigger(),
 fNEntries(0),
 fCurrent(-1),
 fColumn(0x0),
@@ -47,12 +47,12 @@ fL1V0(),
 fL1FrameMask(0)
 {
 	//
-	fL1Threshold[0] = fL1Threshold[1] = 0;
+	for (int i = 0; i < 4; i++) fL1Threshold[i] = 0;
 	fL1V0[0] = fL1V0[1] = 0;	
 }
 
 //_______________
-AliESDCaloTrigger::AliESDCaloTrigger(const AliESDCaloTrigger& src) : TNamed(src),
+AliESDCaloTrigger::AliESDCaloTrigger(const AliESDCaloTrigger& src) : AliVCaloTrigger(src),
 fNEntries(0),
 fCurrent(-1),
 fColumn(0x0),
@@ -111,7 +111,7 @@ AliESDCaloTrigger& AliESDCaloTrigger::operator=(const AliESDCaloTrigger& src)
 void AliESDCaloTrigger::Copy(TObject &obj) const 
 {	
 	//
-	TNamed::Copy(obj);
+	AliVCaloTrigger::Copy(obj);
 	
 	AliESDCaloTrigger& dest = static_cast<AliESDCaloTrigger&>(obj);
 
@@ -127,8 +127,8 @@ void AliESDCaloTrigger::Copy(TObject &obj) const
 		dest.Add(fColumn[i], fRow[i], fAmplitude[i], fTime[i], times, fNL0Times[i], fL1TimeSum[i], fTriggerBits[i]);
 	}	
 
-	dest.SetL1Threshold(0, fL1Threshold[0]);
-	dest.SetL1Threshold(1, fL1Threshold[1]);
+	for (int i = 0; i < 4; i++) dest.SetL1Threshold(i, fL1Threshold[i]);
+	
 	dest.SetL1V0(fL1V0);
 	dest.SetL1FrameMask(fL1FrameMask);
 }
@@ -288,6 +288,7 @@ void AliESDCaloTrigger::Print(const Option_t* /*opt*/) const
 	printf(")\n");
 	printf("--L1:\n");
 	printf("\tTIME SUM: %4d\n", fL1TimeSum[fCurrent]);
-	printf("\tTHRESHOLDS (GAMMA: %4d, JET: %4d)\n", fL1Threshold[0], fL1Threshold[1]);
+	printf("\tHIGH THRESHOLDS (GAMMA: %4d, JET: %4d)\n", fL1Threshold[0], fL1Threshold[1]);
+	printf("\tLOW THRESHOLDS (GAMMA: %4d, JET: %4d)\n", fL1Threshold[2], fL1Threshold[3]);
 	printf("--TRIGGER BITS: 0x%x\n", fTriggerBits[fCurrent]);
 }