Changeset 3400 for trunk/MagicSoft/Mars/mhist/MHCamera.h

Timestamp:

03/04/04 15:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHCamera.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -78 +78 @@
     void   ResetUsed(Int_t idx)    { CLRBIT(fUsed[idx], kIsUsed); }
 
-    Bool_t MatchSector(Int_t idx, Int_t sector) const;
+    Bool_t FindVal(const TArrayI &arr, Int_t val) const
+    {
+        const Int_t n = arr.GetSize();
+        if (n==0)
+            return kTRUE;
+
+        const Int_t *p = arr.GetArray();
+        const Int_t *end = p+n;
+        while (p<end)
+            if (val==*p++)
+                return kTRUE;
+
+        return kFALSE;
+    }
+    Bool_t MatchSector(Int_t idx, const TArrayI &sector, const TArrayI &aidx) const;
 
     // This is a trick to remove TH1 entries from the context menu
@@ -140 +154 @@
     Stat_t   GetBinError(Int_t binx, Int_t biny, Int_t binz) const { return GetBinError(binx); }
 
-    Double_t GetMinimum(Bool_t all) const { return GetMinimumSector(-1, all); }
-    Double_t GetMaximum(Bool_t all) const { return GetMaximumSector(-1, all); }
-
-    Double_t GetMinimum() const { return GetMinimumSector(-1, kFALSE); }
-    Double_t GetMaximum() const { return GetMaximumSector(-1, kFALSE); }
-
-    Double_t GetMinimumSector(Int_t sector, Bool_t all=kFALSE) const;
-    Double_t GetMaximumSector(Int_t sector, Bool_t all=kFALSE) const;
+    Double_t GetMinimum(Bool_t all) const { return GetMinimumSectors(TArrayI(), TArrayI(), all); }
+    Double_t GetMaximum(Bool_t all) const { return GetMaximumSectors(TArrayI(), TArrayI(), all); }
+
+    Double_t GetMinimum() const { return GetMinimumSectors(TArrayI(), TArrayI(), kFALSE); }
+    Double_t GetMaximum() const { return GetMaximumSectors(TArrayI(), TArrayI(), kFALSE); }
+
+    Double_t GetMinimumSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const
+    {
+        return GetMinimumSectors(TArrayI(1, &sector), TArrayI(1, &aidx), all);
+    }
+    Double_t GetMaximumSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const
+    {
+        return GetMaximumSectors(TArrayI(1, &sector), TArrayI(1, &aidx), all);
+    }
+    Double_t GetMinimumSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all=kFALSE) const;
+    Double_t GetMaximumSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all=kFALSE) const;
 
     void     SetLevels(const TArrayF &arr);
@@ -186 +208 @@
     void     AddNotify(TObject *event);
 
-    Stat_t   GetMean(Bool_t all) const { return GetMeanSector(-1, all); }
-    Stat_t   GetRMS(Bool_t all)  const { return GetRmsSector(-1, all); }
-
-    Stat_t   GetMean(Int_t sector=-1) const { return GetMeanSector(-1, kFALSE); }
-    Stat_t   GetRMS(Int_t sector=-1)  const { return GetRmsSector(-1, kFALSE); }
-
-    Stat_t   GetMeanSector(Int_t sector, Bool_t all=kFALSE) const;
-    Stat_t   GetRmsSector(Int_t sector, Bool_t all=kFALSE) const;
+    Stat_t   GetMean(Bool_t all) const { return GetMeanSectors(TArrayI(), TArrayI(), all); }
+    Stat_t   GetRMS(Bool_t all)  const { return GetRmsSectors(TArrayI(), TArrayI(), all); }
+
+    Stat_t   GetMean(Int_t=0) const { return GetMeanSectors(TArrayI(), TArrayI(), kFALSE); }
+    Stat_t   GetRMS(Int_t=0)  const { return GetRmsSectors(TArrayI(), TArrayI(), kFALSE); }
+
+    Stat_t   GetMeanSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const
+    {
+        return GetMeanSectors(TArrayI(1, &sector), TArrayI(1, &aidx), all);
+    }
+    Stat_t   GetRmsSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const
+    {
+        return GetRmsSectors(TArrayI(1, &sector), TArrayI(1, &aidx), all);
+    }
+
+    Stat_t   GetMeanSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all=kFALSE) const;
+    Stat_t   GetRmsSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all=kFALSE) const;
 
     UInt_t   GetNumPixels() const;
 
-    TH1D    *Projection(const char *name="_py") const { return ProjectionS(-1, name); }
-    TH1D    *ProjectionS(Int_t sector, const char *name="_py") const;
+    TH1D    *Projection(const char *name="_py") const { return ProjectionS(TArrayI(), TArrayI(), name); }
+    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_py") const
+    {
+        return ProjectionS(TArrayI(1, &sector), TArrayI(1, &aidx), name);
+    }
+    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_py") const;
 
     const MGeomCam &GetGeomCam() const { return *fGeomCam; }