Corrected treatment of fDetectorStatus: creating the branch, setting the branch addre...

diff --git a/STEER/ESD/AliESDEvent.cxx b/STEER/ESD/AliESDEvent.cxx
index 58fd248f59028a85dbbbbd7863f68b5612f53fa8..8dd0cff8956b828db66fe07e322670d48407cc1f 100644 (file)
--- a/STEER/ESD/AliESDEvent.cxx
+++ b/STEER/ESD/AliESDEvent.cxx
@@ -406,6 +406,7 @@ void AliESDEvent::Reset()
 
   // Reset the standard contents
   ResetStdContent(); 
+  fDetectorStatus = 0xFFFFFFFF;
 
   //  reset for the old data without AliESDEvent...
   if(fESDOld)fESDOld->Reset();
@@ -1606,6 +1607,7 @@ void AliESDEvent::WriteToTree(TTree* tree) const {
       tree->Bronch(branchname, obj->ClassName(), fESDObjects->GetObjectRef(obj),kBufsize, splitLevel);
     }
   }
+  tree->Branch("fDetectorStatus",(void*)&fDetectorStatus,"fDetectorStatus/l");
 }
 
 
@@ -1705,6 +1707,7 @@ void AliESDEvent::ReadFromTree(TTree *tree, Option_t* opt){
       // If connected use the connected list if objects
       fESDObjects->Delete();
       fESDObjects = connectedList;
+      tree->SetBranchAddress("fDetectorStatus",&fDetectorStatus); //PH probably redundant
       GetStdContent(); 
       fOldMuonStructure = fESDObjects->TestBit(BIT(23));
       fConnected = true;
@@ -1768,6 +1771,7 @@ void AliESDEvent::ReadFromTree(TTree *tree, Option_t* opt){
        }
       }
     }
+    tree->SetBranchAddress("fDetectorStatus",&fDetectorStatus);
     GetStdContent();
     // when reading back we are not owner of the list 
     // must not delete it
@@ -1803,6 +1807,7 @@ void AliESDEvent::ReadFromTree(TTree *tree, Option_t* opt){
        }
       }
     }
+    tree->SetBranchAddress("fDetectorStatus",&fDetectorStatus);
     GetStdContent();
     // when reading back we are not owner of the list 
     // must not delete it

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index 5f81e2cf281ef633b8a93806eb3b006df39faec2..01a6f3a3a775e514717dafd00a7c0dc6dc1b6435 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -560,9 +560,9 @@ protected:
   AliCentrality *fCentrality; //! Centrality for AA collision
   AliEventplane *fEventplane; //! Event plane for AA collision
 
-  ULong_t fDetectorStatus; // set detector event status bit for good event selection
+  ULong64_t fDetectorStatus; // set detector event status bit for good event selection
 
-  ClassDef(AliESDEvent,17)  //ESDEvent class 
+  ClassDef(AliESDEvent,18)  //ESDEvent class 
 };
 #endif