Changeset 651 for trunk/MagicSoft

Timestamp:

02/23/01 16:49:26 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MParList.cc (modified) (3 diffs)
• mbase/MParList.h (modified) (3 diffs)
• mraw/MRawEvtPixelIter.cc (modified) (1 diff)
• mraw/MRawEvtPixelIter.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
  * mraw/MRawEvtPixelIter.h: added GetSum* functions
+
+ * mbase/MParList.[h,cc]: Removed unnecessary fNext-stuff
    
    

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -23 +23 @@
 ClassImp(MParList)
 
-MParList::MParList() : fNext(NULL)
+MParList::MParList()
 {
   //
@@ -102 +102 @@
 }
 
-TObject *MParList::FindObject(const char *name) const
+MParContainer *MParList::FindObject(const char *name) const
 {
     //
@@ -108 +108 @@
     //  'name' is the name of the object you are searching for.
     //
-    return (TObject*)fContainer.FindObject(name);
+    return (MParContainer*)fContainer.FindObject(name);
 }
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -26 +26 @@
 {
 private:
-    TIter *fNext;               //!
     TOrdCollection fContainer;  // Collection of Parameter and Data Containers
 
@@ -35 +34 @@
     ~MParList()
     {
-        if (fNext)
-            delete fNext;
     }
 
@@ -43 +40 @@
     void SetLogStream(MLog *log);
 
-    TObject *FindObject(const char *name) const;
-
-    void Reset()
-    {
-        fNext = new TIter(&fContainer);
-    }
-
-    MParContainer *Next()
-    {
-        return (MParContainer*)(*fNext)();
-    }
+    MParContainer *FindObject(const char *name) const;
 
     void Print(Option_t *t = NULL);

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -97 +97 @@
 }
 
+ULong_t MRawEvtPixelIter::GetSumHiGainFadcSamples() const
+{
+    //
+    // return the sum of the hi gain samples of the present pixel
+    //
+    Byte_t *ptr = fHiGainPos;
+    const Byte_t *end = ptr + fData->GetNumHiGainSamples();
 
+    ULong_t sum=0;
 
+    do sum += *ptr++;
+    while (ptr != end);
 
+    return sum;
+}
 
+ULong_t MRawEvtPixelIter::GetSumLoGainFadcSamples() const
+{
+    //
+    // return the sum of the lo gain samples of the present pixel
+    //
+    if (!IsLoGain())
+        return 0;
 
+    Byte_t *ptr = fLoGainPos;
+    const Byte_t *end = ptr + fData->GetNumLoGainSamples();
+
+    ULong_t sum=0;
+
+    do sum += *ptr++;
+    while (ptr != end);
+
+    return sum;
+}
+

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -55 +55 @@
     }
 
-    ULong_t GetSumHiGainFadcSamples() const
-    {
-        //
-        // return the sum of the hi gain samples of the present pixel
-        //
-              Byte_t *ptr = fHiGainPos;
-        const Byte_t *end = ptr + fData->GetNumHiGainSamples();
-
-        ULong_t sum=0;
-
-        do sum += *ptr++;
-        while (ptr != end);
-
-        return sum;
-    }
+    ULong_t GetSumHiGainFadcSamples() const;
 
     Bool_t IsLoGain() const
@@ -88 +74 @@
     }
 
-    ULong_t GetSumLoGainFadcSamples() const
-    {
-        //
-        // return the sum of the lo gain samples of the present pixel
-        //
-        if (!IsLoGain())
-            return 0;
-
-              Byte_t *ptr = fLoGainPos;
-        const Byte_t *end = ptr + fData->GetNumLoGainSamples();
-
-        ULong_t sum=0;
-
-        do sum += *ptr++;
-        while (ptr != end);
-
-        return sum;
-    }
+    ULong_t GetSumLoGainFadcSamples() const;
 
     void Reset();