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 39fe90e06044e6e9431b6493ff05a57267f12462..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;
@@ -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;
 }
 //________________________________________________________________________________