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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHCamera.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -164 +164 @@
 // sector idx matches the sector of the pixel with index idx.
 //
-Bool_t MHCamera::MatchSector(Int_t idx, Int_t sector) const
-{
-    return sector<0 ? kTRUE : (*fGeomCam)[idx].GetSector()==(UInt_t)sector;
+Bool_t MHCamera::MatchSector(Int_t idx, const TArrayI &sector, const TArrayI &aidx) const
+{
+    const MGeomPix &pix = (*fGeomCam)[idx];
+    return FindVal(sector, pix.GetSector()) && FindVal(aidx, pix.GetAidx());
 }
 
@@ -270 +271 @@
 // entries with match the given sector are taken into account.
 //
-Stat_t MHCamera::GetMeanSector(Int_t sector, Bool_t all) const
+Stat_t MHCamera::GetMeanSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all) const
 {
     if (fNcells<=1)
@@ -280 +281 @@
     for (int i=0; i<fNcells-2; i++)
     {
-        if ((all || IsUsed(i)) && MatchSector(i, sector))
+        if ((all || IsUsed(i)) && MatchSector(i, sector, aidx))
         {
             mean += fArray[i+1];
@@ -296 +297 @@
 // entries with match the given sector are taken into account.
 //
-Stat_t MHCamera::GetRmsSector(Int_t sector, Bool_t all) const
+Stat_t MHCamera::GetRmsSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all) const
 {
     if (fNcells<=1)
@@ -307 +308 @@
     for (int i=0; i<fNcells-2; i++)
     {
-        if ((all || IsUsed(i)) && MatchSector(i, sector))
+        if ((all || IsUsed(i)) && MatchSector(i, sector, aidx))
         {
             sum += fArray[i+1];
@@ -327 +328 @@
 // only pixels with matching sector number are taken into account.
 //
-Double_t MHCamera::GetMinimumSector(Int_t sector, Bool_t all) const
+Double_t MHCamera::GetMinimumSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all) const
 {
     if (fMinimum != -1111)
@@ -338 +339 @@
 
     for (Int_t idx=0; idx<fNcells-2; idx++)
-        if (MatchSector(idx, sector) && (all || IsUsed(idx)) && fArray[idx+1]<minimum)
+        if (MatchSector(idx, sector, aidx) && (all || IsUsed(idx)) && fArray[idx+1]<minimum)
             minimum = fArray[idx+1];
 
@@ -350 +351 @@
 // only pixels with matching sector number are taken into account.
 //
-Double_t MHCamera::GetMaximumSector(Int_t sector, Bool_t all) const
+Double_t MHCamera::GetMaximumSectors(const TArrayI &sector, const TArrayI &aidx, Bool_t all) const
 {
     if (fMaximum!=-1111)
@@ -360 +361 @@
     Double_t maximum=-FLT_MAX;
     for (Int_t idx=0; idx<fNcells-2; idx++)
-        if (MatchSector(idx, sector) && (all || IsUsed(idx)) && fArray[idx+1]>maximum)
+        if (MatchSector(idx, sector, aidx) && (all || IsUsed(idx)) && fArray[idx+1]>maximum)
             maximum = fArray[idx+1];
 
@@ -496 +497 @@
 // into account.
 //
-TH1D *MHCamera::ProjectionS(Int_t sector, const char *name) const
+TH1D *MHCamera::ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name) const
 {
     Int_t nbins = 50;
@@ -505 +506 @@
     {
         pname.Prepend(GetName());
-        if (sector>=0)
-            pname += sector;
+        if (sector.GetSize()>0)
+        {
+            pname += ";";
+            for (int i=0; i<sector.GetSize(); i++)
+                pname += sector[i];
+        }
+        if (aidx.GetSize()>0)
+        {
+            pname += ";";
+            for (int i=0; i<aidx.GetSize(); i++)
+                pname += aidx[i];
+        }
     }
 
@@ -520 +531 @@
     if (!h1)
     {
-        Double_t min = GetMinimumSector(sector);
-        Double_t max = GetMaximumSector(sector);
+        Double_t min = GetMinimumSectors(sector, aidx);
+        Double_t max = GetMaximumSectors(sector, aidx);
 
         Int_t newbins=0;
@@ -536 +547 @@
     // Fill the projected histogram
     for (Int_t idx=0; idx<fNcells-2; idx++)
-        if (IsUsed(idx) && MatchSector(idx, sector))
+        if (IsUsed(idx) && MatchSector(idx, sector, aidx))
             h1->Fill(GetBinContent(idx+1));