Changeset 9239 for trunk/MagicSoft/Mars/msim/MPhotonEvent.h

Timestamp:

01/22/09 19:07:37 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msim/MPhotonEvent.h (modified) (4 diffs)

trunk/MagicSoft/Mars/msim/MPhotonEvent.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
-/*
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
-*/
+
 #ifndef ROOT_TClonesArray
 #include <TClonesArray.h>
 #endif
 
-// gcc 3.2
-//class ifstream;
 #include <iosfwd>
-
-/*
-class TH1;
-class TH2;
-class TH3;
-*/
 
 class MPhotonData;
@@ -71 +59 @@
         Changed();
     }
+
+    void SetSorted() { fSorted = kTRUE; }
 };
 
-class MPhotonEvent : public MParContainer//, public MCamEvent
+class MPhotonEvent : public MParContainer
 {
 private:
@@ -81 +71 @@
     MPhotonEvent(const char *name=NULL, const char *title=NULL);
 
-    //void Clear(Option_t * = NULL);
-    void Print(Option_t * = NULL) const;
+    // TObjArray, FIXME: This could be improved if checking for IsSortable is omitted
+    void Sort(Bool_t force=kFALSE) { if (force) fData.UnSort(); fData.Sort(); }
+    Bool_t IsSorted() const { return fData.IsSorted(); }
 
-    const char *GetClassName() const;
+
+    // Getter/Setter
+    Int_t GetNumPhotons() const { return fData.GetEntriesFast(); }
 
     TClonesArray &GetArray() { return fData; }
     const TClonesArray &GetArray() const { return fData; }
-    void Remove(TObject *o) { fData.Remove(o); }
 
     MPhotonData &Add(Int_t n);
     MPhotonData &Add();
+
+    MPhotonData *GetFirst() const;
+    MPhotonData *GetLast() const;
 
     MPhotonData &operator[](UInt_t idx);
@@ -106 +101 @@
         //        for (int i=fData.GetSize()-1; i>=n; i--)
         //          fData.RemoveAt(i);
-        static_cast<MyClonesArray&>(fData).FastRemove(n, fData.GetSize()-1);
+        const Bool_t sorted = fData.IsSorted();
+
+        MyClonesArray &loc = static_cast<MyClonesArray&>(fData);
+
+        loc.FastRemove(n, fData.GetSize()-1);
+
+        // If it was sorted before it is also sorted now.
+        if (sorted)
+            loc.SetSorted();
 
         return fData.GetEntriesFast();
     }
-/*
-    void Expand(Int_t n)
-    {
-        for (int i=fData.GetSize(); i<n; i++)
-            fData.New(i);
-    }
- */
+
+    // I/O
     Int_t ReadCorsikaEvt(istream &fin);
     Int_t ReadRflEvt(istream &fin);
 
-    Int_t GetNumPhotons() const { return fData.GetEntriesFast(); }
-/*
-    void FillRad(TH1 &hist, Float_t scale=1) const;
-    void FillRad(TH2 &hist, Double_t x, Float_t scale=1) const;
-    void Fill(TH2 &hist, Float_t scale=1) const;
-    void Fill(TH3 &hist, Double_t z, Float_t scale=1) const;
- */
+    // TObject
     void Paint(Option_t *o="");
-
-//    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
-//    void   DrawPixelContent(Int_t num) const;
-
-    void Sort() { fData.Sort(); }
+    void Print(Option_t * = NULL) const;
+    //void Clear(Option_t * = NULL);
 
     ClassDef(MPhotonEvent, 1) //Container to store the raw Event Data