Fix fixed-string length bug

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

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index e7230d560e03bf39179c7ba532acf38be949a2b8..7883a1d0bb402d8713d6d1a56b475ed6bba26300 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -13,12 +13,18 @@
 
 #include <TArrayF.h>
 #include <TArrayI.h>
+#include <TList.h>
+#include <TClonesArray.h>
 #include <TMCProcess.h>
 #include <TVirtualMCApplication.h>
 
 class TParticle;
+class TFile;
+class TTree;
+
 class AliGenerator;
 class AliMCQA;
+class AliTrackReference;
 
 class AliMC : public TVirtualMCApplication {
 public:
@@ -37,6 +43,8 @@ public:
 //  MC Application
 //
    virtual  void  ConstructGeometry();
+   virtual  Bool_t  MisalignGeometry();
+   virtual  void  ConstructOpGeometry();
    virtual  void  InitGeometry();     
    virtual  void  SetAllAlignableVolumes();     
    virtual  void  GeneratePrimaries();
@@ -84,7 +92,7 @@ public:
    TList*         GetHitLists() const {return fHitLists ;}
    Int_t          GetNtrack() const;
    virtual  Int_t GetPrimary(Int_t track) const;
-   TObjArray     *Particles() const;
+   const TObjArray* Particles() const;
    TParticle     *Particle(Int_t i) const;
    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg, 
                           Float_t *pmom, Float_t *vpos, Float_t *polar, 
@@ -101,15 +109,18 @@ public:
    virtual  void  KeepTrack(Int_t itra) const;
    virtual  void  FlagTrack(Int_t track) const;
    virtual  void  SetCurrentTrack(Int_t track) const;                           
-// Track reference related 
-   virtual void   AddTrackReference(Int_t label);
-   TClonesArray   *TrackReferences()   const {return fTrackReferences;}
-   virtual void   RemapTrackReferencesIDs(Int_t *map); //remaping track references MI
-   virtual void   ResetTrackReferences();
-   virtual void   FixParticleDecaytime();
-
-private:
+// Track reference related
+   AliTrackReference* AddTrackReference(Int_t label, Int_t id = -999);
+   // const TClonesArray*      TrackReferences()   const {return &fTrackReferences;}
+   virtual void       RemapTrackReferencesIDs(Int_t *map); //remaping track references MI
+   virtual void       ResetTrackReferences();
+   virtual void       FixParticleDecaytime();
+ private:
+   void MakeTmpTrackRefsTree();
+   void ReorderAndExpandTreeTR();
+ private:
    void Copy (TObject &mc) const;
+   void RemapHits();
    AliGenerator  *fGenerator;         //  Generator used in the MC
    TArrayF        fEventEnergy;       //! Energy deposit for current event
    TArrayF        fSummEnergy;        //! Energy per event in each volume
@@ -122,11 +133,13 @@ private:
    TArrayI       *fImedia;            //! Array of correspondence between media and detectors
    TString        fTransParName;      //  Name of the transport parameters file
    AliMCQA       *fMCQA;              //  Pointer to MC Quality assurance class
-   //PH
    TList         *fHitLists;          //! Lists of hits to be remapped by PurifyKine
-  TClonesArray *fTrackReferences;     //!list of track references - for one primary track only -MI
-    
-    ClassDef(AliMC,2)
+   //Temporary Track Reference tree related
+   TTree         *fTmpTreeTR;            //! Temporary track reference tree
+   TFile         *fTmpFileTR;            //! Temporary track reference file
+   TClonesArray   fTrackReferences;      //! List of track references - for one primary track only
+   TClonesArray   fTmpTrackReferences;   //! Temporary list of track references - for one primary track only
+   ClassDef(AliMC, 4)
 };