Changeset 959 for trunk/MagicSoft/Mars/manalysis

Timestamp:

10/02/01 14:46:56 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1ReadAscii.cc (modified) (1 diff)
• MCerPhotEvt.cc (modified) (6 diffs)
• MCerPhotEvt.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -62 +62 @@
 MCT1ReadAscii::MCT1ReadAscii(const char *fname,
                              const char *name, 
-                             const char *title)
+                             const char *title)
+    : fIn(NULL)
 {
     *fName  = name  ? name  : "MCT1ReadAscii";

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -116 +116 @@
 // Checks if in the pixel list is an entry with pixel id
 //
-Bool_t MCerPhotEvt::IsPixelExisting(Int_t id)
+Bool_t MCerPhotEvt::IsPixelExisting(Int_t id) const
 {
     const Int_t entries = fPixels->GetEntries();
@@ -123 +123 @@
     {
         if (id == (*this)[il].GetPixId())
-            return kTRUE ;
-    }
-
-    return kFALSE ;
+            return kTRUE;
+    }
+
+    return kFALSE;
 } 
 
@@ -133 +133 @@
 //   Checks if in the pixel list is an entry with pixel id
 //
-Bool_t MCerPhotEvt::IsPixelUsed(Int_t id)
-{
-    const Int_t entries = fPixels->GetEntries();
-
-    for (Int_t il=0; il<entries; il++ )
+Bool_t MCerPhotEvt::IsPixelUsed(Int_t id) const
+{
+    const Int_t entries = fPixels->GetEntries();
+
+    for (Int_t il=0; il<entries; il++)
     {
         MCerPhotPix &pix = (*this)[il];
 
         if (id == pix.GetPixId() && pix.IsPixelUsed())
-            return kTRUE ;
-    }
-
-    return kFALSE ;
+            return kTRUE;
+    }
+
+    return kFALSE;
 } 
 
@@ -152 +152 @@
 //   Checks if in the pixel list is an entry with pixel id
 //
-Bool_t MCerPhotEvt::IsPixelCore(Int_t id)
-{
-    const Int_t entries = fPixels->GetEntries();
-
-    for (Int_t il=0; il<entries; il++ )
+Bool_t MCerPhotEvt::IsPixelCore(Int_t id) const
+{
+    const Int_t entries = fPixels->GetEntries();
+
+    for (Int_t il=0; il<entries; il++)
     {
         MCerPhotPix &pix = (*this)[il];
 
-        if ( id == pix.GetPixId() && pix.IsCorePixel())
-            return kTRUE ;
+        if (id == pix.GetPixId() && pix.IsCorePixel())
+            return kTRUE;
     } 
 
-    return kFALSE ;
+    return kFALSE;
 } 
 
@@ -171 +171 @@
 // get the minimum number of photons of all valid pixels in the list
 //
-Float_t MCerPhotEvt::GetNumPhotonsMin()
+Float_t MCerPhotEvt::GetNumPhotonsMin() const
 {
     if (fNumPixels <= 0)
-        return -5. ;
+        return -5.;
 
     Float_t minval = (*this)[0].GetNumPhotons();
 
     Float_t testval;
-    for (UInt_t i=1 ; i<fNumPixels; i++ )
+    for (UInt_t i=1; i<fNumPixels; i++)
     {
         testval = (*this)[i].GetNumPhotons();
@@ -194 +194 @@
 // get the maximum number of photons of all valid pixels in the list
 //
-Float_t MCerPhotEvt::GetNumPhotonsMax()
+Float_t MCerPhotEvt::GetNumPhotonsMax() const
 {
     if (fNumPixels <= 0)

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -33 +33 @@
     void Print(Option_t *opt=NULL);
 
-    Bool_t  IsPixelExisting( Int_t id );
-    Bool_t  IsPixelUsed    ( Int_t id );
-    Bool_t  IsPixelCore    ( Int_t id );
+    Bool_t  IsPixelExisting(Int_t id) const;
+    Bool_t  IsPixelUsed    (Int_t id) const;
+    Bool_t  IsPixelCore    (Int_t id) const;
 
-    Float_t GetNumPhotonsMin();
-    Float_t GetNumPhotonsMax();
+    Float_t GetNumPhotonsMin() const;
+    Float_t GetNumPhotonsMax() const;
 
     MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->At(i)); }