From 0ca3804d2871462409a326a5ef220f6417c8dcfe Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 12 Apr 2013 12:03:23 +0000 Subject: [PATCH] Corrected treatment of fDetectorStatus: creating the branch, setting the branch address, resetting --- STEER/ESD/AliESDEvent.cxx | 5 +++++ STEER/ESD/AliESDEvent.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/STEER/ESD/AliESDEvent.cxx b/STEER/ESD/AliESDEvent.cxx index 58fd248f590..8dd0cff8956 100644 --- 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 5f81e2cf281..01a6f3a3a77 100644 --- 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 -- 2.43.0