Do not reset a zero pointer to MC info

[u/mrichter/AliRoot.git] / STEER / AliDetectorTag.h

diff --git a/STEER/AliDetectorTag.h b/STEER/AliDetectorTag.h
index 7557d9a48f4c4213bd02e6a4124f51f924bbad74..bcd97361a9208930c646ba48054d0b7edb373991 100644 (file)
--- a/STEER/AliDetectorTag.h
+++ b/STEER/AliDetectorTag.h
@@ -14,7 +14,7 @@
 //-------------------------------------------------------------------------
 
 #include "TObject.h"
-#include "TString.h"
+#include "TObjArray.h"
 
 //___________________________________________________________________________
 class AliDetectorTag : public TObject {
@@ -27,7 +27,8 @@ class AliDetectorTag : public TObject {
   
   //____________________________________________________//
   void SetDetectorMask(UInt_t mask) {fMask = mask; Int2Bin();}
-  const char *GetDetectorMask() {return fDetectorString.Data();}
+  TObjArray *GetDetectorMask() {return fDetectorArray;}
+  UInt_t GetIntDetectorMask();
   void PrintDetectorMask();
 
   //____________________________________________________//
@@ -68,26 +69,26 @@ class AliDetectorTag : public TObject {
   void SetZDC() {fZDC = kTRUE;}
   void SetEMCAL() {fEMCAL = kTRUE;}
   
-  TString  fDetectorString;//detectors' names - active
-  UInt_t   fMask;          //detector mask
-  UInt_t   fDetectors[20]; //detector mask
-  Bool_t   fITSSPD;        //ITS-SPD active = 1
-  Bool_t   fITSSDD;        //ITS-SDD active = 1
-  Bool_t   fITSSSD;        //ITS-SSD active = 1
-  Bool_t   fTPC;           //TPC active = 1
-  Bool_t   fTRD;           //TRD active = 1
-  Bool_t   fTOF;           //TOF active = 1
-  Bool_t   fHMPID;         //HMPID active = 1
-  Bool_t   fPHOS;          //PHOS active = 1
-  Bool_t   fPMD;           //PMD active = 1
-  Bool_t   fMUON;          //MUON active = 1
-  Bool_t   fFMD;           //FMD active = 1
-  Bool_t   fTZERO;         //TZERO active = 1
-  Bool_t   fVZERO;         //VZERO active = 1
-  Bool_t   fZDC;           //ZDC active = 1
-  Bool_t   fEMCAL;         //EMCAL active = 1
+  TObjArray *fDetectorArray; //detectors' names - active
+  UInt_t     fMask;          //detector mask
+  UInt_t     fDetectors[32]; //detector mask
+  Bool_t     fITSSPD;        //ITS-SPD active = 1
+  Bool_t     fITSSDD;        //ITS-SDD active = 1
+  Bool_t     fITSSSD;        //ITS-SSD active = 1
+  Bool_t     fTPC;           //TPC active = 1
+  Bool_t     fTRD;           //TRD active = 1
+  Bool_t     fTOF;           //TOF active = 1
+  Bool_t     fHMPID;         //HMPID active = 1
+  Bool_t     fPHOS;          //PHOS active = 1
+  Bool_t     fPMD;           //PMD active = 1
+  Bool_t     fMUON;          //MUON active = 1
+  Bool_t     fFMD;           //FMD active = 1
+  Bool_t     fTZERO;         //TZERO active = 1
+  Bool_t     fVZERO;         //VZERO active = 1
+  Bool_t     fZDC;           //ZDC active = 1
+  Bool_t     fEMCAL;         //EMCAL active = 1
 
-  ClassDef(AliDetectorTag,3)  //(ClassName, ClassVersion)
+  ClassDef(AliDetectorTag,4)  //(ClassName, ClassVersion)
 };
 //______________________________________________________________________________