unlock TGeoManager before deleting it

[u/mrichter/AliRoot.git] / STEER / ESD / AliESDHeader.cxx

diff --git a/STEER/ESD/AliESDHeader.cxx b/STEER/ESD/AliESDHeader.cxx
index 6c7cc37d721b8530b9092860b003580e3c7f10af..403fddc0df692af566e6f25dcdc005810d8403b2 100644 (file)
--- a/STEER/ESD/AliESDHeader.cxx
+++ b/STEER/ESD/AliESDHeader.cxx
@@ -33,6 +33,7 @@ ClassImp(AliESDHeader)
 AliESDHeader::AliESDHeader() :
   AliVHeader(),
   fTriggerMask(0),
+  fTriggerMaskNext50(0),
   fOrbitNumber(0),
   fTimeStamp(0),
   fEventType(0),
@@ -73,6 +74,7 @@ AliESDHeader::~AliESDHeader()
 AliESDHeader::AliESDHeader(const AliESDHeader &header) :
   AliVHeader(header),
   fTriggerMask(header.fTriggerMask),
+  fTriggerMaskNext50(header.fTriggerMaskNext50),
   fOrbitNumber(header.fOrbitNumber),
   fTimeStamp(header.fTimeStamp),
   fEventType(header.fEventType),
@@ -115,6 +117,7 @@ AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
   if(this!=&header) {
     AliVHeader::operator=(header);
     fTriggerMask = header.fTriggerMask;
+    fTriggerMaskNext50 = header.fTriggerMaskNext50;
     fOrbitNumber = header.fOrbitNumber;
     fTimeStamp = header.fTimeStamp;
     fEventType = header.fEventType;
@@ -172,6 +175,7 @@ void AliESDHeader::Reset()
 {
   // reset all data members
   fTriggerMask       = 0;
+  fTriggerMaskNext50 = 0;
   fOrbitNumber       = 0;
   fTimeStamp         = 0;
   fEventType         = 0;
@@ -222,7 +226,7 @@ void AliESDHeader::Print(const Option_t *) const
          printf("List of the active trigger inputs: ");
         for(Int_t i = 0; i < kNTriggerInputs; i++) {
           TNamed *str = (TNamed *)((fTriggerInputsNames).At(i));
-          if (str) printf("%s ",str->GetName());
+          if (str) printf("%i %s ",i,str->GetName());
          }
          printf("\n");
 }
@@ -274,21 +278,21 @@ TString AliESDHeader::GetFiredTriggerInputs() const
   TString trginputs;
   for(Int_t i = 0; i < kNTriggerInputs; i++) {
       TNamed *str = (TNamed *)((fTriggerInputsNames.At(i)));
-      if (i < 24 && (fL0TriggerInputs & (1 << i))) {
+      if (i < 24 && (fL0TriggerInputs & (1ul << i))) {
         if (str) {
          trginputs += " ";
          trginputs += str->GetName();
           trginputs += " ";
         }
       }
-      if (i >= 24 && i < 48 && (fL1TriggerInputs & (1 << (i-24)))) {
+      if (i >= 24 && i < 48 && (fL1TriggerInputs & (1ul << (i-24)))) {
         if (str) {
          trginputs += " ";
          trginputs += str->GetName();
           trginputs += " ";
         }
       }
-      if (i >= 48 && (fL2TriggerInputs & (1 << (i-48)))) {
+      if (i >= 48 && (fL2TriggerInputs & (1u << (i-48)))) {
         if (str) {
          trginputs += " ";
          trginputs += str->GetName();
@@ -310,9 +314,9 @@ Bool_t AliESDHeader::IsTriggerInputFired(const char *name) const
   Int_t inputIndex = fTriggerInputsNames.IndexOf(trginput);
   if (inputIndex < 0) return kFALSE;
   
-  if (fL0TriggerInputs & (1 << inputIndex)) return kTRUE;
-  else if (fL1TriggerInputs & (1 << (inputIndex-24))) return kTRUE;
-  else if (fL2TriggerInputs & (1 << (inputIndex-48))) return kTRUE;
+  if (fL0TriggerInputs & (1lu << inputIndex)) return kTRUE;
+  else if (fL1TriggerInputs & (1lu << (inputIndex-24))) return kTRUE;
+  else if (fL2TriggerInputs & (1u << (inputIndex-48))) return kTRUE;
   else return kFALSE;
 }
 //________________________________________________________________________________
@@ -480,7 +484,7 @@ TObjArray AliESDHeader::GetIRArray(Int_t int1, Int_t int2, Float_t deltaTime) co
 }
 
 //__________________________________________________________________________
-void AliESDHeader::SetIRInteractionMap()
+void AliESDHeader::SetIRInteractionMap() const
 {
   //
   // Function to compute the map of interations 
@@ -524,7 +528,7 @@ void AliESDHeader::SetIRInteractionMap()
 }
 
 //__________________________________________________________________________
-Int_t AliESDHeader::FindIRIntInteractionsBXMap(Int_t difference)
+Int_t AliESDHeader::FindIRIntInteractionsBXMap(Int_t difference) const
 {
   //
   // The mapping is of 181 bits, from -90 to +90
@@ -538,7 +542,7 @@ Int_t AliESDHeader::FindIRIntInteractionsBXMap(Int_t difference)
 }
 
 //__________________________________________________________________________
-Int_t AliESDHeader::GetIRInt2ClosestInteractionMap()
+Int_t AliESDHeader::GetIRInt2ClosestInteractionMap() const
 {
   //
   // Calculation of the closest interaction
@@ -570,7 +574,7 @@ Int_t AliESDHeader::GetIRInt2ClosestInteractionMap()
 }
 
 //__________________________________________________________________________
-Int_t AliESDHeader::GetIRInt1ClosestInteractionMap(Int_t gap)
+Int_t AliESDHeader::GetIRInt1ClosestInteractionMap(Int_t gap) const
 {
   //
   // Calculation of the closest interaction
@@ -604,7 +608,7 @@ Int_t AliESDHeader::GetIRInt1ClosestInteractionMap(Int_t gap)
 }
 
 //__________________________________________________________________________
-Int_t  AliESDHeader::GetIRInt2LastInteractionMap()
+Int_t  AliESDHeader::GetIRInt2LastInteractionMap() const
 {
   //
   // Calculation of the last interaction