Changeset 9239 for trunk/MagicSoft/Mars/msim

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msim

Files:

• MPhotonData.cc (modified) (1 diff)
• MPhotonEvent.cc (modified) (7 diffs)
• MPhotonEvent.h (modified) (4 diffs)

trunk/MagicSoft/Mars/msim/MPhotonData.cc

@@ -216 +216 @@
         gLog << "Weight:           " << fWeight << endl;
 }
-
-/*
-#include <TH2.h>
-#include <TH3.h>
-
-// --------------------------------------------------------------------------
-//
-// Fill radial photon distance scaled by scale into 1D histogram.
-//
-void MPhotonData::FillRad(TH1 &hist, Float_t scale) const
-{
-    hist.Fill(TMath::Hypot(fPosX, fPosY)*scale);
-}
-
-// --------------------------------------------------------------------------
-//
-// Fill radial photon distance scaled by scale versus x into 2D histogram.
-//
-void MPhotonData::FillRad(TH2 &hist, Double_t x, Float_t scale) const
-{
-    hist.Fill(x, TMath::Hypot(fPosX, fPosY)*scale);
-}
-
-// --------------------------------------------------------------------------
-//
-// Fill photon position (x,y) scaled by scale into 2D histogram.
-// (Note north in the camera plane is -y, and east -x)
-//
-void MPhotonData::Fill(TH2 &hist, Float_t scale) const
-{
-    hist.Fill(fPosY*scale, fPosX*scale);
-}
-
-// --------------------------------------------------------------------------
-//
-// Fill photon position (x,y) scaled by scale versus z into 3D histogram.
-// (Note north in the camera plane is -y, and east -x)
-//
-void MPhotonData::Fill(TH3 &hist, Double_t z, Float_t scale) const
-{
-    hist.Fill(fPosY*scale, fPosX*scale);
-}
-
-*/

trunk/MagicSoft/Mars/msim/MPhotonEvent.cc

@@ -57 +57 @@
 // Here is an example (how to remove every second entry)
 //
+//  ---------------------------------------------------------------------
+//
 //    Int_t cnt = 0;
 //
@@ -91 +93 @@
 //     MPhotonEvent->Shrink(cnt);
 //
+//  ---------------------------------------------------------------------
+//
+// The flag for a sorted array is for speed reasons not in all conditions
+// maintained automatically. Especially Add() doesn't reset it.
+//
+// So be sure that if you want to sort your array it is really sorted.
+//
 //
 //   Version 1:
@@ -127 +136 @@
 }
 
+/*
 const char *MPhotonEvent::GetClassName() const
 {
     return static_cast<TObject*>(fData.GetClass())->GetName();
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -184 +195 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return a pointer to the first photon if available.
+//
+MPhotonData *MPhotonEvent::GetFirst() const
+{
+    return static_cast<MPhotonData*>(fData.First());
+}
+
+// --------------------------------------------------------------------------
+//
+// Return a pointer to the last photon if available.
+//
+MPhotonData *MPhotonEvent::GetLast() const
+{
+    return static_cast<MPhotonData*>(fData.Last());
+}
+
+// --------------------------------------------------------------------------
+//
+// Read the Event section from the file
+//
 Int_t MPhotonEvent::ReadCorsikaEvt(istream &fin)
 {
@@ -234 +267 @@
 
     Shrink(n);
+    fData.UnSort();
 
     SetReadyToSave();
@@ -241 +275 @@
 }
 
+// --------------------------------------------------------------------------
+//
 Int_t MPhotonEvent::ReadRflEvt(std::istream &fin)
 {
@@ -291 +327 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Print the array
+//
 void MPhotonEvent::Print(Option_t *) const
 {
     fData.Print();
 }
-
-/*
-// --------------------------------------------------------------------------
-//
-// Fills all photon distances scaled with scale (default=1) into a TH1
-//
-void MPhotonEvent::FillRad(TH1 &hist, Float_t scale) const
-{
-    MPhotonData *ph=NULL;
-
-    TIter Next(&fData);
-    while ((ph=(MPhotonData*)Next()))
-        ph->FillRad(hist, scale);
-}
-
-// --------------------------------------------------------------------------
-//
-// Fills all photon distances scaled with scale (default=1) versus x
-// into a TH2
-//
-void MPhotonEvent::FillRad(TH2 &hist, Double_t x, Float_t scale) const
-{
-    MPhotonData *ph=NULL;
-
-    TIter Next(&fData);
-    while ((ph=(MPhotonData*)Next()))
-        ph->FillRad(hist, x, scale);
-}
-
-// --------------------------------------------------------------------------
-//
-// Fills all photons (x,y) scaled with scale (default=1) into a TH2.
-//
-void MPhotonEvent::Fill(TH2 &hist, Float_t scale) const
-{
-    MPhotonData *ph=NULL;
-
-    TIter Next(&fData);
-    while ((ph=(MPhotonData*)Next()))
-        ph->Fill(hist, scale);
-}
-
-// --------------------------------------------------------------------------
-//
-// Fills all photons (x,y) scaled with scale (default=1) versus z into a TH3
-//
-void MPhotonEvent::Fill(TH3 &hist, Double_t z, Float_t scale) const
-{
-    MPhotonData *ph=NULL;
-
-    TIter Next(&fData);
-    while ((ph=(MPhotonData*)Next()))
-        ph->Fill(hist, z, scale);
-}
-
-void MPhotonEvent::DrawPixelContent(Int_t num) const
-{
-}
-
-#include "MHexagon.h"
-#include "MGeomCam.h"
-#include <TMarker.h>
-
-// ------------------------------------------------------------------------
-//
-// Fill a reflector event. Sums all pixels in each pixel as the
-// pixel contents.
-//
-// WARNING: Due to the estimation in DistanceToPrimitive and the
-//          calculation in pixels instead of x, y this is only a
-//          rough estimate.
-//
-Bool_t MPhotonEvent::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
-{
-    //
-    // sum the photons content in each pixel
-    //
-    val = 0;
-
-    MHexagon hex(cam[idx]);
-
-    MPhotonData *ph=NULL;
-
-    TIter Next(&fData);
-
-    switch (type)
-    {
-
-    case 1: // time
-        while ((ph=(MPhotonData*)Next()))
-            if (hex.DistanceToPrimitive(ph->GetPosY(), ph->GetPosX())<=0)
-                val += ph->GetTime();
-        return val/fData.GetEntriesFast()>0;
-
-    default: // signal
-        while ((ph=(MPhotonData*)Next()))
-            if (hex.DistanceToPrimitive(ph->GetPosY()*10, ph->GetPosX()*10)<=0)
-                val += cam.GetPixRatio(idx);
-        return val>0;
-    }
-
-    return kFALSE;
-
-}
-*/
 
 // ------------------------------------------------------------------------

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