X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliESDRun.cxx;h=12536e50133f4eb5bbd4960fc449d22307cf4c2e;hb=132422328f016462e8858650098796f4d0ebfd66;hp=0836bf6c6126440e99d22b7d70703e0ef8128507;hpb=1c7554f9f40094e41658dc2221f1bf59ac641d94;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliESDRun.cxx b/STEER/AliESDRun.cxx
index 0836bf6c612..12536e50133 100644
--- a/STEER/AliESDRun.cxx
+++ b/STEER/AliESDRun.cxx
@@ -46,13 +46,17 @@ AliESDRun::AliESDRun() :
   fTriggerClasses(kNTriggerClasses),
   fDetInDAQ(0),
   fDetInReco(0)
+  
 {
   for (Int_t i=0; i<2; i++) fDiamondXY[i]=0.;
   fDiamondCovXY[0]=fDiamondCovXY[2]=3.*3.;
   fDiamondCovXY[1]=0.;
   fTriggerClasses.SetOwner(kTRUE);
+  fMeanBeamInt[0][0]=fMeanBeamInt[0][1]=fMeanBeamInt[1][0]=fMeanBeamInt[1][1]=-1;
   for (Int_t m=0; m<kNPHOSMatrix; m++) fPHOSMatrix[m]=NULL;
   for (Int_t sm=0; sm<kNEMCALMatrix; sm++) fEMCALMatrix[sm]=NULL;
+  for (Int_t i=0; i<kT0spreadSize;i++) fT0spread[i]=0.;
+  for (Int_t it=0; it<8; it++) fCaloTriggerType[it]=0;
 }
 
 //______________________________________________________________________________
@@ -87,13 +91,18 @@ AliESDRun::AliESDRun(const AliESDRun &esd) :
     else
       fPHOSMatrix[m]=NULL;
   }
-	
+  
+  for (int ib=2;ib--;) for (int it=2;it--;) fMeanBeamInt[ib][it] = esd.fMeanBeamInt[ib][it];
+
   for(Int_t sm=0; sm<kNEMCALMatrix; sm++){
 	if(esd.fEMCALMatrix[sm])
 		fEMCALMatrix[sm]=new TGeoHMatrix(*(esd.fEMCALMatrix[sm])) ;
 	else
 		fEMCALMatrix[sm]=NULL;
   }
+  for (Int_t i=0; i<kT0spreadSize;i++) fT0spread[i]=esd.fT0spread[i];
+  for (Int_t it=0; it<8; it++) fCaloTriggerType[it]=esd.fCaloTriggerType[it];
+
 }
 
 //______________________________________________________________________________
@@ -123,6 +132,8 @@ AliESDRun& AliESDRun::operator=(const AliESDRun &esd)
     fDetInDAQ   = esd.fDetInDAQ;
     fDetInReco  = esd.fDetInReco;
 
+    for (int ib=2;ib--;) for (int it=2;it--;) fMeanBeamInt[ib][it] = esd.fMeanBeamInt[ib][it];
+
     for(Int_t m=0; m<kNPHOSMatrix; m++){
       if(esd.fPHOSMatrix[m])
 	fPHOSMatrix[m]=new TGeoHMatrix(*(esd.fPHOSMatrix[m])) ;
@@ -137,6 +148,8 @@ AliESDRun& AliESDRun::operator=(const AliESDRun &esd)
 		  fEMCALMatrix[sm]=0;
 	}
   } 
+  for (Int_t i=0; i<kT0spreadSize;i++) fT0spread[i]=esd.fT0spread[i];
+  for (Int_t it=0; it<8; it++) fCaloTriggerType[it]=esd.fCaloTriggerType[it];
   return *this;
 }
 
@@ -170,15 +183,17 @@ AliESDRun::~AliESDRun() {
 
 void AliESDRun::SetDiamond(const AliESDVertex *vertex) {
   // set the interaction diamond
-  fDiamondXY[0]=vertex->GetXv();
-  fDiamondXY[1]=vertex->GetYv();
-  fDiamondZ=vertex->GetZv();
-  Double32_t cov[6];
-  vertex->GetCovMatrix(cov);
-  fDiamondCovXY[0]=cov[0];
-  fDiamondCovXY[1]=cov[1];
-  fDiamondCovXY[2]=cov[2];
-  fDiamondSig2Z=cov[5];
+  if (vertex) {
+    fDiamondXY[0]=vertex->GetXv();
+    fDiamondXY[1]=vertex->GetYv();
+    fDiamondZ=vertex->GetZv();
+    Double32_t cov[6];
+    vertex->GetCovMatrix(cov);
+    fDiamondCovXY[0]=cov[0];
+    fDiamondCovXY[1]=cov[1];
+    fDiamondCovXY[2]=cov[2];
+    fDiamondSig2Z=cov[5];
+  }
 }
 
 
@@ -198,6 +213,8 @@ void AliESDRun::Print(const Option_t *) const
     TNamed *str = (TNamed *)((fTriggerClasses).At(i));
     if (str) printf("%s ",str->GetName());
   }
+  printf("Mean intenstity for interacting   : beam1:%+.3e beam2:%+.3e\n",fMeanBeamInt[0][0],fMeanBeamInt[1][0]);
+  printf("Mean intenstity for non-intecting : beam1:%+.3e beam2:%+.3e\n",fMeanBeamInt[0][1],fMeanBeamInt[1][1]);
   printf("\n");
 }
 
@@ -344,3 +361,34 @@ Bool_t AliESDRun::InitMagneticField() const
   }
   //
 }
+
+//_____________________________________________________________________________
+void AliESDRun::SetT0spread(Int_t i,Float_t t) 
+{
+  //
+  // Setting the T0 spread value at index i 
+  //
+
+  if ( (i>=0) && (i<kT0spreadSize)) {
+    fT0spread[i]=t;
+  } else {
+    AliError(Form("Index %d out of bound",i));
+  }
+  return;
+}
+
+//_____________________________________________________________________________
+void AliESDRun::SetT0spread(Float_t *t) 
+{
+  //
+  // Setting the T0 spread values
+  //
+  if (t == 0x0){
+    AliError(Form("Null pointer passed"));
+  }
+  else{
+    for (Int_t i=0;i<kT0spreadSize;i++) fT0spread[i]=t[i];
+  }
+  return;
+}
+