Changeset 19561 for trunk/Mars

Timestamp:

07/11/19 17:15:32 (5 years ago)

Author:

(none)

Message:

Replace cast to MyClonesArray with making fData an MClonesArray

Location:

trunk/Mars/msim

Files:

• MClonesArray.cc (added)
• MClonesArray.h (added)
• MPhotonEvent.cc (modified) (5 diffs)
• MPhotonEvent.h (modified) (4 diffs)
• Makefile (modified) (1 diff)
• SimLinkDef.h (modified) (1 diff)

trunk/Mars/msim/MPhotonEvent.cc

@@ -101 +101 @@
 //
 //
-//   Version 1:
+//   Version 2:
 //   ----------
 //    - First implementation
+//    - fData is now A MClonesArray to avoid casting issues on some compilers
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -127 +128 @@
 using namespace std;
 
-// ==========================================================================
-
-class MyClonesArray : public TClonesArray
-{
-public:
-    TObject **FirstRef() { return fCont; }
-
-    // --------------------------------------------------------------------------
-    //
-    // This is an extremly optimized version of ExpandCreateFast. It only resets
-    // the marker for the last element (fLast) to n-1 and doen't change anything
-    // else. This implicitly assumes that the stored objects don't allocate
-    // memory. It does not necessarily mean that the slots after fLast
-    // are empty (set to 0). This is what is assumed in the TClonesArray.
-    // We also don't call Changed() because it would reset Sorted. If the
-    // array was sorted before it is also sorted now. You MUST make sure
-    // that you only set n in a range for which valid entries have been
-    // created before (e.g. by ExpandCreateFast).
-    //
-    void FastShrink(Int_t n)
-    {
-        fLast = n - 1;
-    }
-
-    // --------------------------------------------------------------------------
-    //
-    // This is a optimized (faster) version of Delete which deletes consequtive
-    // entries from index idx1 to idx2 (both included) and calls their
-    // destructor. Note that there is no range checking done!
-    //
-    void FastRemove(Int_t idx1, Int_t idx2)
-    {
-        // Remove object at index idx.
-
-        //if (!BoundsOk("RemoveAt", idx1)) return 0;
-        //if (!BoundsOk("RemoveAt", idx2)) return 0;
-
-        Long_t dtoronly = TObject::GetDtorOnly();
-
-        idx1 -= fLowerBound;
-        idx2 -= fLowerBound;
-
-        for (TObject **obj=fCont+idx1; obj<=fCont+idx2; obj++)
-        {
-            if (!*obj)
-                continue;
-
-            if ((*obj)->TestBit(kNotDeleted)) {
-                // Tell custom operator delete() not to delete space when
-                // object fCont[i] is deleted. Only destructors are called
-                // for this object.
-                TObject::SetDtorOnly(*obj);
-                delete *obj;
-            }
-
-            *obj = 0;
-            // recalculate array size
-        }
-        TObject::SetDtorOnly((void*)dtoronly);
-
-        if (idx1<=fLast && fLast<=idx2)
-        {
-            do {
-                fLast--;
-            } while (fLast >= 0 && fCont[fLast] == 0);
-        }
-
-        Changed();
-    }
-
-
-    //void SetSorted() { fSorted = kTRUE; }
-
-    // --------------------------------------------------------------------------
-    //
-    // This is an optimized version of Sort which doesn't check the
-    // IsSortable flag before. It only sorts the entries from 0
-    // to GetEntriesFast().
-    //
-    void UncheckedSort()
-    {
-        if (fSorted)
-            return;
-
-        const Int_t nentries = GetEntriesFast();
-        if (nentries <= 0)
-            return;
-
-        QSort(GetObjectRef(First()), fKeep->GetObjectRef(fKeep->First()),
-              0, TMath::Min(nentries, kMaxInt-fLowerBound));
-
-        fSorted = kTRUE;
-    }
-};
-
-// ==========================================================================
 
 // --------------------------------------------------------------------------
@@ -274 +179 @@
 
     // Just set fLast = n -1
-    static_cast<MyClonesArray&>(fData).FastShrink(n);
+    fData.FastShrink(n);
     return fData.GetEntriesFast();
 }
@@ -370 +275 @@
     {
         o=fData.UncheckedAt(n);
-        static_cast<MyClonesArray&>(fData).FastShrink(n+1);
+        fData.FastShrink(n+1);
     }
     else
@@ -396 +301 @@
         fData.UnSort();
 
-    static_cast<MyClonesArray&>(fData).UncheckedSort(); /*Sort(GetEntriesFast())*/
+    fData.UncheckedSort();
+    // fData.Sort(fData.GetEntriesFast());
 }
 

trunk/Mars/msim/MPhotonEvent.h

@@ -11 +11 @@
 
 #include <iosfwd>
+#include "MClonesArray.h"
 
 using namespace std;
@@ -21 +22 @@
 {
 private:
-    TClonesArray fData;
+    MClonesArray fData;
 
 public:
@@ -41 +42 @@
     Double_t GetMeanT() const;
 
-    TClonesArray &GetArray() { return fData; }
-    const TClonesArray &GetArray() const { return fData; }
+    MClonesArray &GetArray() { return fData; }
+    const MClonesArray &GetArray() const { return fData; }
 
     Bool_t AsciiWrite(ostream &out) const;
@@ -71 +72 @@
     //void Clear(Option_t * = NULL);
 
-    ClassDef(MPhotonEvent, 1) //Container to store the raw Event Data
+    ClassDef(MPhotonEvent, 2) //Container to store the raw Event Data
 };
 

trunk/Mars/msim/Makefile

@@ -28 +28 @@
            MSimAtmosphere.cc \
            MSimAbsorption.cc \
-           MSimPointingPos.cc
+           MSimPointingPos.cc \
+           MClonesArray.cc
 
 ############################################################

trunk/Mars/msim/SimLinkDef.h

@@ -18 +18 @@
 #pragma link C++ class MSimMMCS+;
 
+#pragma link C++ class MClonesArray-; // - needed as custom streamer is already implemented
+
 #endif