Changeset 3490 for trunk/MagicSoft

Timestamp:

03/12/04 17:56:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbadpixels/MBadPixelsTreat.cc (modified) (18 diffs)
• mbadpixels/MBadPixelsTreat.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/03/12: Thomas Bretz
+
+   * merpp.cc:
+     - added 'force' option
+
+   * manalysis/MCerPhotAnal2.cc:
+     - extract pedestal and pedestal rms from lo-gain if hi-gain not
+       above a certain athreshold 
+
+   * mastro/MAstroCatalog.[h,c]:
+     - added text argument to DrawStar
+
+   * mbase/MStatusDisplay.cc:
+     - some small changes to output of SaveAsPS
+
+   * mfilter/MFCosmics.cc:
+     - changed output of filter statistics
+
+   * mbadpixels/MBadPixelsTreat.[h,cc]:
+     - fixed some problems with the code - now it should work like
+       expected
+     - added a new member function to be able to change the number
+       of required neighbors
+
+
 
  2004/03/12: Wolfgang Wittek
@@ -28 +53 @@
      - include MObservatory.h
      - call member function Rotationangle() of MObservatory
+
 
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -34 +34 @@
 //  an existing MBadPixelsCam.
 //
+//  It check if there are enough neighbors to calculate the mean
+//  If not, unmap the pixel. The minimum number of good neighbors
+//  should be set using SetNumMinNeighbors
+//
 //  Input Containers:
 //   MCerPhotEvt
@@ -79 +83 @@
 //
 MBadPixelsTreat::MBadPixelsTreat(const char *name, const char *title)
-    : fFlags(0)
+    : fFlags(0), fNumMinNeighbors(3)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -147 +151 @@
     for (UShort_t i=0; i<entries; i++)
     {
+        MCerPhotPix *pix = fEvt->GetPixById(i);
+
         //
         // Check whether pixel with idx i is blind
         //
-        if (!(*fBadPixels)[i].IsBad())
+        if (pix && (*fBadPixels)[i].IsOK())
             continue;
 
@@ -157 +163 @@
         // create a new entry for this pixel in MCerPhotEvt
         //
-        MCerPhotPix *pix = fEvt->GetPixById(i);
         if (!pix)
+        {
             pix = fEvt->AddPixel(i, 0, 0);
+            (*fBadPixels)[i].SetUnsuitable(MBadPixelsPix::kUnsuitableEvt);
+        }
 
         //
@@ -193 +201 @@
             // Do not use blind neighbors
             //
-            if (!(*fBadPixels)[i].IsBad())
+            if ((*fBadPixels)[i].IsBad())
                 continue;
 
@@ -254 +262 @@
         // Check whether pixel with idx i is blind
         //
-        if (!(*fBadPixels)[i].IsBad())
+        if ((*fBadPixels)[i].IsOK())
             continue;
 
@@ -290 +298 @@
             // Do not use blind neighbors
             //
-            if (!(*fBadPixels)[i].IsBad())
+            if ((*fBadPixels)[i].IsBad())
                 continue;
 
@@ -302 +310 @@
             //The error is calculated as the quadratic sum of the errors
             //
-            ped[i] += (nratio*nppix.GetMean());
+            ped[i] += nratio*nppix.GetMean();
             rms[i] += nratio*Pow2(nppix.GetRms());
 
@@ -310 +318 @@
         // Check if there are enough neighbors to calculate the mean
         // If not, unmap the pixel. The minimum number of good neighbors
-        // should be 3
-        if (num < 3)
+        // should be fNumMinNeighbors
+        if (num < fNumMinNeighbors)
         {
             MCerPhotPix *pix =fEvt->GetPixById(i);
@@ -350 +358 @@
     // Create arrays
     //
-    Double_t *nphot  = new Double_t[entries];
-    Double_t *perr   = new Double_t[entries];
-    Double_t *ped    = new Double_t[entries];
-    Double_t *pedrms = new Double_t[entries];
+    TArrayD nphot(entries);
+    TArrayD perr(entries);
+    TArrayD ped(entries);
+    TArrayD pedrms(entries);
  
     //
@@ -360 +368 @@
     for (UShort_t i=0; i<entries; i++)
     {
+        MCerPhotPix *pix = fEvt->GetPixById(i);
+
         //
         // Check whether pixel with idx i is blind
         //
-        if ((*fBadPixels)[i].IsBad())
+        if (pix && (*fBadPixels)[i].IsOK())
             continue;
 
@@ -370 +380 @@
         // create a new entry for this pixel in MCerPhotEvt
         //
-        const MCerPhotPix *pix = fEvt->GetPixById(i);
         if (!pix)
+        {
             pix = fEvt->AddPixel(i, 0, 0);
+            (*fBadPixels)[i].SetUnsuitable(MBadPixelsPix::kUnsuitableEvt);
+        }
 
         //
@@ -395 +407 @@
         const Double_t ratio = fGeomCam->GetPixRatio(i);
 
-        nphot[i]  *= ratio;
-        ped[i]    *= ratio;
-        perr[i]   *= Pow2(ratio);
-        pedrms[i] *= Pow2(pedrms[i]);
+        if (nucp)
+        {
+            nphot[i]  *= ratio;
+            perr[i]   *= ratio;
+            ped[i]    *= ratio;
+            pedrms[i] *= ratio;
+        }
 
         //
@@ -411 +426 @@
             // Do not use blind neighbors
             //
-            if ((*fBadPixels)[i].IsBad())
+            if ((*fBadPixels)[nidx].IsBad())
                 continue;
 
@@ -428 +443 @@
 
             //
-            //The error is calculated as the quadratic sum of the errors
+            // The error is calculated as the quadratic sum of the errors
             //
+            nphot[i]  += nratio*evtpix->GetNumPhotons();
             ped[i]    += nratio*nppix.GetMean();
-            nphot[i]  += nratio*evtpix->GetNumPhotons();
-            perr[i]   += Pow2(nratio*evtpix->GetErrorPhot());
-            pedrms[i] += Pow2(nratio*nppix.GetRms());
+            perr[i]   += nratio*Pow2(evtpix->GetErrorPhot());
+            pedrms[i] += nratio*Pow2(nppix.GetRms());
 
             num++;
+        }
+
+        if (num<2)
+        {
+            pix->SetPixelUnmapped();
+            nphot[i]  = 0;
+            ped[i]    = 0;
+            perr[i]   = 0;
+            pedrms[i] = 0;
+            continue;
         }
 
@@ -443 +468 @@
         nphot[i] /= num*ratio;
         ped[i]   /= num*ratio;
-        perr[i]   = TMath::Sqrt(perr[i]/num)*ratio;
-        pedrms[i] = TMath::Sqrt(pedrms[i]/num)*ratio;
+        perr[i]   = TMath::Sqrt(perr[i]/(num*ratio));
+        pedrms[i] = TMath::Sqrt(pedrms[i]/(num*ratio));
 
     }
@@ -457 +482 @@
         // Do not use blind neighbors
         //
-        if ((*fBadPixels)[i].IsBad())
+        if ((*fBadPixels)[i].IsOK())
             continue;
 
@@ -466 +491 @@
         (*fPedPhot)[i].Set(ped[i], pedrms[i]);
     }
-
-    //
-    // Delete the intermediat arrays
-    //
-    delete nphot;
-    delete perr;
-    delete ped;
-    delete pedrms;
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

@@ -20 +20 @@
 
     Byte_t fFlags;       // flag for the method which is used
+    Byte_t fNumMinNeighbors;
+
 
     enum
@@ -50 +52 @@
         b ? SETBIT(fFlags, kUseCentralPixel) : CLRBIT(fFlags, kUseCentralPixel);
     }
+    void SetNumMinNeighbors(UShort_t num) { fNumMinNeighbors=num; }