Changeset 1466 for trunk/MagicSoft

Timestamp:

08/01/02 10:27:39 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MBlindPixelCalc.cc (modified) (8 diffs)
• manalysis/MBlindPixelCalc.h (modified) (2 diffs)
• manalysis/MBlindPixels.h (modified) (1 diff)
• manalysis/MCameraSmooth.cc (added)
• manalysis/MCameraSmooth.h (added)
• manalysis/MCerPhotPix.h (modified) (1 diff)
• manalysis/MHillas.cc (modified) (3 diffs)
• manalysis/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - some changes to the layout
      - added support for the sign in MHHillasExt
+
+   * manalysis/MBlindPixelCalc.[h,cc]:
+     - added the possibility to use the interpolation of the
+       surrounding pixels
+     - clean the array with the blind pixel IDs at any ReInit
+
+   * manalysis/MBlindPixels.h:
+     - IsBlind now checks also for the validity of the array
+
+   * manalysis/MCerPhotPix.h:
+     - added Set-function
+
+   * manalysis/MHillas.cc:
+     - Don't ouput a warning if fSize==0 or fNumUsedPixels<0
+       (happens too often)
+
+   * manalysis/MCameraSmooth.[h,cc]:
+     - added
+
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
+     - added MCameraSmooth
 
 

trunk/MagicSoft/Mars/NEWS

@@ -59 +59 @@
      MHillasExt are now scaled with the pixel size, so that one get
      a four times smaller value for the bigger pixels in the outer ring.
+
+   - added new task to smooth the camera (MCameraSmooth)
+
+   - added possibility to use interpolated pixel values for blind pixels
+     instead of removing it completely from the analysis
 
 

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MCerPhotPix+;
 #pragma link C++ class MCerPhotEvt+;
+#pragma link C++ class MCerPhotAnal+;
 #pragma link C++ class MCerPhotCalc+;
-#pragma link C++ class MCerPhotAnal+;
 #pragma link C++ class MCerPhotCalc2+;
 
 #pragma link C++ class MImgCleanStd+;
+#pragma link C++ class MCameraSmooth+;
 
 #pragma link C++ class MBlindPixels+;

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

@@ -51 +51 @@
 
 #include "MParList.h"
+
+#include "MGeomPix.h"
+#include "MGeomCam.h"
 #include "MCerPhotPix.h"
 #include "MCerPhotEvt.h"
 #include "MBlindPixels.h"
+
 #include "MMcRunHeader.hxx"
 
@@ -63 +67 @@
 //
 MBlindPixelCalc::MBlindPixelCalc(const char *name, const char *title)
-
+    : fUseInterpolation(kFALSE), fUseCentralPixel(kFALSE)
 {
     fName  = name  ? name  : "MBlindPixelCalc";
@@ -85 +89 @@
     if (!fEvt)
     {
-        *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl;
+        *fLog << err << dbginf << "MCerPhotEvt not found... aborting." << endl;
         return kFALSE;
     }
+
+    fGeomCam = (MGeomCam*)pList->FindObject("MGeomCam");
+    if (!fGeomCam)
+        *fLog << warn << dbginf << "No camera geometry available... can't ude interpolation." << endl;
 
     const UShort_t size = fPixelsID.GetSize();
@@ -112 +120 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// Remove the pixels.
-//
-Bool_t MBlindPixelCalc::Process()
+void MBlindPixelCalc::Interpolate() const
 {
     const UShort_t entries = fEvt->GetNumPixels();
+
+    Double_t *nphot = new Double_t[entries];
+    Double_t *perr  = new Double_t[entries];
 
     //
@@ -129 +135 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        if (fPixels->IsBlind(pix.GetPixId()))
+        const Int_t id = pix.GetPixId();
+
+        if (!fPixels->IsBlind(id))
+            continue;
+
+        const MGeomPix &gpix = (*fGeomCam)[id];
+
+        const Int_t n = gpix.GetNumNeighbors();
+
+        nphot[i] = fUseCentralPixel ? (*fEvt)[id].GetNumPhotons() : 0;
+        perr[i]  = fUseCentralPixel ? (*fEvt)[id].GetErrorPhot()  : 0;
+        for (int j=0; j<n; j++)
+        {
+            const UShort_t nid = gpix.GetNeighbor(j);
+
+            nphot[i] += (*fEvt)[nid].GetNumPhotons();
+            perr[i]  += (*fEvt)[nid].GetErrorPhot();
+        }
+
+        nphot[i] /= fUseCentralPixel ? n+1 : n;
+        perr[i]  /= fUseCentralPixel ? n+1 : n;
+    }
+
+    if (fUseInterpolation && fGeomCam)
+        for (UShort_t i=0; i<entries; i++)
+        {
+            MCerPhotPix &pix = (*fEvt)[i];
+
+            if (fPixels->IsBlind(pix.GetPixId()))
+                pix.Set(nphot[i], perr[i]);
+        }
+
+    delete nphot;
+    delete perr;
+}
+
+void MBlindPixelCalc::Unmap() const
+{
+    const UShort_t entries = fEvt->GetNumPixels();
+
+    //
+    // remove the pixels in fPixelsID if they are set to be used,
+    // (set them to 'unused' state)
+    //
+    for (UShort_t i=0; i<entries; i++)
+    {
+        MCerPhotPix &pix = (*fEvt)[i];
+
+        if (fPixels->IsBlind(pix.GetPixId()))
             pix.SetPixelUnused();
-    }
+
+    }
+}
+
+// --------------------------------------------------------------------------
+//
+// Remove the pixels.
+//
+Bool_t MBlindPixelCalc::Process()
+{
+    if (fUseInterpolation && fGeomCam)
+        Interpolate();
+    else
+        Unmap();
 
     return kTRUE;
@@ -165 +232 @@
 
     //
+    // Delete the old array holding the blind pixels for the last file
+    //
+    fPixels->Clear();
+
+    //
     // Set as blind some particular pixels because of a particular
     // Star Field of View.
@@ -180 +252 @@
     {
         *fLog << warn << "Warning - Detected Starfield unknown..." << endl;
-        return kSKIP;
+        return kTRUE;
     }
 
@@ -186 +258 @@
     // Case for Crab Nebula FOV
     //
-    fPixels->Clear();
     fPixels->SetPixelBlind(400);
     fPixels->SetPixelBlind(401);

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.h

@@ -10 +10 @@
 #endif
 
+class MGeomCam;
 class MCerPhotEvt;
 class MBlindPixels;
@@ -18 +19 @@
     MCerPhotEvt  *fEvt;     //!
     MBlindPixels *fPixels;  //!
+    MGeomCam     *fGeomCam; //!
 
     TArrayS fPixelsID;  // Pixel IDs for blind pixels, which are entered by the user.
 
+    Bool_t fUseInterpolation;
+    Bool_t fUseCentralPixel;
+
+    void Interpolate() const;
+    void Unmap() const;
+
 public:
     MBlindPixelCalc(const char *name=NULL, const char *title=NULL);
+
+    void SetUseInterpolation(Bool_t b=kTRUE) { fUseInterpolation=kTRUE; }
+    void SetUseCetralPixel(Bool_t b=kTRUE)   { fUseCentralPixel=kTRUE; }
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/manalysis/MBlindPixels.h

@@ -23 +23 @@
     void Clear(Option_t *o="")  { fPixels.Reset(); }
 
-    Bool_t IsBlind(UShort_t id) { return (Bool_t)fPixels[id]; }
+    Bool_t IsBlind(UShort_t id) { return fPixels.GetSize() && fPixels[id]; }
 
     ClassDef(MBlindPixels, 1) // container to store blind pixels

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -37 +37 @@
     Bool_t  IsPixelCore() const      { return fIsCore;  }
 
-    void    SetNumPhotons(Float_t f) { fPhot    = f; }
-    void    SetErrorPhot(Float_t f)  { fErrPhot = f; }
+    void    SetNumPhotons(Float_t f)    { fPhot    = f; }
+    void    SetErrorPhot(Float_t f)     { fErrPhot = f; }
+    void    Set(Float_t np, Float_t ep) { fPhot = np; fErrPhot = ep; }
 
     void    Print(Option_t *opt = NULL) const;

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -279 +279 @@
     if (fSize==0)
     {
-        *fLog << warn << GetDescriptor() << ": Event has zero cerenkov photons... skipped." << endl;
+        //*fLog << inf << GetDescriptor() << ": Event has zero cerenkov photons... skipped." << endl;
         return kFALSE;
     }
@@ -285 +285 @@
     if (fNumUsedPixels<3)
     {
-        *fLog << warn << GetDescriptor() << ": Event has less than 3 used pixels... skipped." << endl;
+        //*fLog << inf << GetDescriptor() << ": Event has less than 3 used pixels... skipped." << endl;
         return kFALSE;
     }
@@ -327 +327 @@
     // If corrxy=0 (which should never happen, because fSize>0) we
     // cannot calculate Length and Width. The calculation failed
-    // and returnes kFALSE
+    // and returns kFALSE
+    // In reallity it is almost impossible to have a distribution
+    // of cerenkov photons in the used pixels which is exactly symmetric
+    // along one of the axis.
     //
     if (corrxy==0)
     {
-        *fLog << warn << GetDescriptor() << ": Event has CorrXY==0... skipped." << endl;
+        *fLog << inf << GetDescriptor() << ": Event has CorrXY==0... skipped." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -37 +37 @@
            MEnergyEstimate.cc \
            MSrcPosCam.cc \
+           MCameraSmooth.cc \
            MHadroness.cc \
            MCompProbCalc.cc \