Changeset 3415

Timestamp:

03/05/04 21:29:08 (21 years ago)

Author:

tonello

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MBlindPixelsCalc2.cc (added)
• manalysis/MBlindPixelsCalc2.h (added)
• manalysis/MCerPhotPix.h (modified) (4 diffs)
• manalysis/Makefile (modified) (1 diff)
• mastro/MAstroCatalog.cc (modified) (1 diff)
• mimage/MImgCleanStd.cc (modified) (6 diffs)
• msql/MSQLServer.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+2004/03/05: Nadia Tonello
+
+   * manalysis/MBlindPixelsCalc2.[h,cc]
+   * manalysis/AnalysisLinkDef.h
+   * manalysis/Makefile
+     - Temporary class added (will be included in mbadpixels/ soon)
+     - All the functions of MBlindPixelCalc are kept(with small improvements)
+     - New function added: SetCheckPedestalRms
+
+   * manalysis/MCerPhotPix.h
+     - Status Unmapped added (not include the pixel in the cleaned image)
+
+   * mimage/MImgCleanStd.cc 
+     - Checks for Unmapped status added 
+
+   * mastro/MAstroCatalog.cc
+   * msql/MSQLServer.cc
+     - include <stdlib.h> to solve compilation error
+
+
 2004/03/05: Sebastian Raducci
    * msignal/MArrivalTimeCalc.cc

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -16 +16 @@
 #pragma link C++ class MBlindPixels+;
 #pragma link C++ class MBlindPixelCalc+;
+#pragma link C++ class MBlindPixelsCalc2+;
 
 #pragma link C++ class MPedestalPix+;

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -12 +12 @@
     Int_t    fPixId;     // the pixel Id
 
-    UShort_t fRing;      // NT: number of analyzed rings around the core pixels (fRing>0 means: used)
+   Short_t fRing;      // NT: number of analyzed rings around the core pixels, fRing>0 means: used, fRing= 0 means: unused, fRing= -1 means: unmapped (no possible to use in the calculation of the image parameters)
     Bool_t   fIsCore;    // the pixel is a Core pixel -> kTRUE
 
@@ -30 +30 @@
 
     Bool_t   IsPixelUsed() const         { return fRing>0; }
+    Bool_t   IsPixelUnmapped() const     { return fRing==-1; }
     void     SetPixelUnused()            { fRing=0; }
     void     SetPixelUsed()              { fRing=1; }
+    void     SetPixelUnmapped()          { fRing=-1;}
 
     void     SetRing(UShort_t r)         { fRing = r;   }
@@ -52 +54 @@
     void     Print(Option_t *opt = NULL) const;
 
-    ClassDef(MCerPhotPix, 2)  // class containing information about the Cerenkov Photons in a pixel
+    ClassDef(MCerPhotPix, 3)  // class containing information about the Cerenkov Photons in a pixel
 };
 
@@ -58 +60 @@
 
 
+

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -60 +60 @@
            MBlindPixels.cc \
            MBlindPixelCalc.cc \
+           MBlindPixelsCalc2.cc \
            MEventRate.cc \
            MEventRateCalc.cc \

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -42 +42 @@
 #include <TVirtualPad.h>
 
+#include <stdlib.h>
+
 #include "MLog.h"
 #include "MLogManip.h"

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -340 +340 @@
     MCerPhotEvtIter Next(fEvt, kFALSE);
     while ((pix=static_cast<MCerPhotPix*>(Next())))
-        if (data[pix->GetPixId()] <= fCleanLvl1)
+        if (!pix->IsPixelUnmapped() && data[pix->GetPixId()] <= fCleanLvl1)
             pix->SetPixelUnused();
 }
@@ -356 +356 @@
     // Loop over used pixels only
     TIter Next(*fEvt);
+
     while ((pix=static_cast<MCerPhotPix*>(Next())))
-    {
+          {
         // get pixel id of this entry
         const Int_t idx = pix->GetPixId();
@@ -387 +388 @@
     // now we declare all pixels that survive as CorePixels
     //
+
     Next.Reset();
     while ((pix=static_cast<MCerPhotPix*>(Next())))
-        pix->SetPixelCore();
+      {
+        if ( pix->IsPixelUsed())
+        pix->SetPixelCore();}
 } 
 
@@ -430 +434 @@
     //
     if (pix.GetRing() != 0)
-        return;
+      {  
+        return;
+      }
 
     //
@@ -471 +477 @@
 
         // Loop over all pixels
+
         MCerPhotEvtIter NextAll(fEvt, kFALSE);
         while ((pix=static_cast<MCerPhotPix*>(NextAll())))
-        {
+          {
             //
-            // if pixel is a core pixel go to the next pixel
+            // if pixel is a core pixel or unmapped, go to the next pixel
             //
-            if (pix->IsPixelCore())
-                continue;
-
-            if (data[pix->GetPixId()] <= fCleanLvl2)
-                continue;
-
-            if (r==1)
-                CleanStep3b(*pix);
-            else
-                CleanStep4(r, *pix);
+          if (pix->IsPixelCore())
+            {
+            continue;}
+          if (pix->IsPixelUnmapped())
+            {
+            continue;}
+          
+          if (data[pix->GetPixId()] <= fCleanLvl2)
+            {
+              continue;}
+
+          if (r==1)
+            {
+            CleanStep3b(*pix);}
+          else
+            {
+            CleanStep4(r, *pix);}
+          
         }
     }
@@ -553 +568 @@
 #endif
     CleanStep1();
+
 #ifdef DEBUG
     *fLog << all << "CleanStep 2" << endl;

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -36 +36 @@
 #include <iostream>
 #include <iomanip>
+#include <stdlib.h>
 
 #include <TROOT.h>