Changeset 6858 for trunk/MagicSoft/Mars/mfilter

Timestamp:

03/18/05 18:07:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• FilterLinkDef.h (modified) (1 diff)
• MFSoftwareTrigger.cc (modified) (15 diffs)
• MFSoftwareTrigger.h (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MFParticleId+;
 
-#pragma link C++ class MFSelBasic+;
-#pragma link C++ class MFSelStandard+;
-#pragma link C++ class MFSelFinal+;
 #pragma link C++ class MFSoftwareTrigger+;
 #pragma link C++ class MFCosmics+;

trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc

@@ -57 +57 @@
 //
 //  WARNING: Using trigger type kAllPattern resets the BIT(21) bit
-//           of all pixels in MCerPhotEvt
+//           of all pixels in MSignalCam
 //
 //
 //  Input:
-//    MCerPhotEvt
-//    MArrivalTime
+//    MSignalCam
 //    MGeomCam
 //
@@ -76 +75 @@
 #include "MGeomCam.h"
 
-#include "MCerPhotEvt.h"
-#include "MArrivalTime.h"
+#include "MSignalCam.h"
+//#include "MArrivalTime.h"
 
 ClassImp(MFSoftwareTrigger);
@@ -88 +87 @@
 //
 MFSoftwareTrigger::MFSoftwareTrigger(const char *name, const char *title)
-    : fCam(NULL), fEvt(NULL), fTme(NULL), fThreshold(5),
+    : fCam(NULL), fEvt(NULL), fThreshold(5),
     fTimeWindow(0.5), fNumNeighbors(4), fType(kSinglePixelNeighbors)
 {
@@ -112 +111 @@
 {
     // Try to get the pixel information of a pixel with this index
-    MCerPhotPix *pix = fEvt->GetPixById(idx);
+    MSignalPix *pix = fEvt->GetPixById(idx);
 
     // If a pixel with this index is not existing... do nothing.
@@ -133 +132 @@
         return 0;
 
-    const Float_t tm1 = fTme ? (*fTme)[idx] : 0;
-    if (fTme && TMath::Abs(tm1-tm0)>fTimeWindow)
+    const Float_t tm1 = pix->GetArrivalTime();
+    if (TMath::Abs(tm1-tm0)>fTimeWindow)
         return 0;
 
@@ -157 +156 @@
 {
     // Try to get the pixel information of a pixel with this index
-    MCerPhotPix *pix = fEvt->GetPixById(idx);
+    MSignalPix *pix = fEvt->GetPixById(idx);
 
     // If a pixel with this index is not existing... do nothing.
@@ -210 +209 @@
     ResetBits(kWasChecked);
 
+    const UInt_t npixevt = fEvt->GetNumPixels();
+    for (UInt_t idx=0; idx<npixevt; idx++)
+    {
+        const MSignalPix &pix = (*fEvt)[idx];
+        if (!pix.IsPixelUsed())
+            continue;
+
+        // Check if trigger condition is fullfilled for this pixel
+        if (CountPixels(idx, pix.GetArrivalTime()) >= fNumNeighbors)
+            return kTRUE;
+    }
+
+/*
     // Reset bit
-    MCerPhotPix *pix=0;
+    MSignalPix *pix=0;
 
     // We could loop over all indices which looks more straight
     // forward but should be a lot slower (assuming zero supression)
     TIter Next(*fEvt);
-    while ((pix=static_cast<MCerPhotPix*>(Next())))
+    while ((pix=static_cast<MSignalPix*>(Next())))
     {
         // Check if trigger condition is fullfilled for this pixel
@@ -223 +235 @@
             return kTRUE;
     }
-
+  */
     return kFALSE;
 }
@@ -230 +242 @@
 {
     // Try to get the pixel information of a pixel with this index
-    MCerPhotPix *pix = fEvt->GetPixById(idx);
+    MSignalPix *pix = fEvt->GetPixById(idx);
 
     // If a pixel with this index is not existing... do nothing.
@@ -283 +295 @@
 {
     // Reset bit
-    MCerPhotPix *pix=0;
+    MSignalPix *pix=0;
 
     // We could loop over all indices which looks more straight
     // forward but should be a lot slower (assuming zero supression)
     TIter Next(*fEvt);
-    while ((pix=static_cast<MCerPhotPix*>(Next())))
+    while ((pix=static_cast<MSignalPix*>(Next())))
     {
         ResetBits(kWasChecked|kIsCoincident);
@@ -302 +314 @@
 */
 
-Bool_t MFSoftwareTrigger::CheckPixel(const MCerPhotPix &pix) const
-{
+const MSignalPix *MFSoftwareTrigger::CheckPixel(Int_t i) const
+{
+    const MSignalPix &pix = (*fEvt)[i];
+
     if (!pix.IsPixelUsed())
-        return kFALSE;
-
-    if (pix.GetNumPhotons()*fCam->GetPixRatio(pix.GetPixId())<fThreshold)
-        return kFALSE;
-
-    if ((*fCam)[pix.GetPixId()].IsInOutermostRing())
-        return kFALSE;
-
-    return kTRUE;
+        return NULL;
+
+    if (pix.GetNumPhotons()*fCam->GetPixRatio(i)<fThreshold)
+        return NULL;
+
+    if ((*fCam)[i].IsInOutermostRing())
+        return NULL;
+
+    return &pix;
 }
 
@@ -326 +340 @@
     for (Int_t i=0; i<entries; i++)
     {
-        const MCerPhotPix &pix0 = (*fEvt)[i];
-        if (!CheckPixel(pix0))
+        const MSignalPix *pix0 = CheckPixel(i);
+        if (!pix0)
             continue;
 
         Int_t num = 1;
 
-        const MGeomPix &gpix = (*fCam)[pix0.GetPixId()];
+        const MGeomPix &gpix = (*fCam)[i];
 
         const Int_t nneighbors = gpix.GetNumNeighbors();
@@ -338 +352 @@
         {
             const Int_t idx1 = gpix.GetNeighbor(n);
-            if (!CheckPixel(*fEvt->GetPixById(idx1)))
+
+            const MSignalPix *pix1 = CheckPixel(idx1);
+            if (!pix1)
                 continue;
 
-            if (fTme)
-            {
-                const Float_t t0 = (*fTme)[pix0.GetPixId()];
-                const Float_t t1 = (*fTme)[idx1];
-
-                if (TMath::Abs(t0-t1)>fTimeWindow)
-                    continue;
-            }
+            const Float_t t0 = pix0->GetArrivalTime();
+            const Float_t t1 = pix1->GetArrivalTime();
+
+            if (TMath::Abs(t0-t1)>fTimeWindow)
+                continue;
 
             if (++num==fNumNeighbors)
@@ -359 +372 @@
 // --------------------------------------------------------------------------
 //
-// Request pointer to MCerPhotEvt and MGeomCam from paremeter list
+// Request pointer to MSignalCam and MGeomCam from paremeter list
 //
 Int_t MFSoftwareTrigger::PreProcess(MParList *pList)
 {
-    fEvt = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt");
+    fEvt = (MSignalCam*)pList->FindObject("MSignalCam");
     if (!fEvt)
     {
-        *fLog << err << "MCerPhotEvt not found... aborting." << endl;
+        *fLog << err << "MSignalCam not found... aborting." << endl;
         return kFALSE;
     }
@@ -375 +388 @@
         *fLog << err << "MGeomCam not found... aborting." << endl;
         return kFALSE;
-    }
-
-    fTme = 0;
-    if (fTimeWindow>0)
-    {
-        fTme = (MArrivalTime*)pList->FindObject("MArrivalTime");
-        if (!fTme)
-        {
-            *fLog << err << "MArrivalTime not found... aborting." << endl;
-            return kFALSE;
-        }
     }
 

trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.h

@@ -8 +8 @@
 class MMcEvt;
 class MGeomCam;
-class MCerPhotEvt;
-class MCerPhotPix;
+class MSignalCam;
+class MSignalPix;
 class MArrivalTime;
 
@@ -23 +23 @@
 private:
     const MGeomCam     *fCam; // Camera Geometry
-    const MCerPhotEvt  *fEvt; // Cerenkov Photon Event
+    const MSignalCam   *fEvt; // Cerenkov Photon Event
     const MArrivalTime *fTme;
 
@@ -47 +47 @@
 
     void ResetBits(Int_t bits) const;
-    Bool_t CheckPixel(const MCerPhotPix &pix) const;
+    const MSignalPix *CheckPixel(Int_t i) const;
     Bool_t SwTrigger() const;
     Bool_t SwCoincidence() const;

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -24 +24 @@
            MFParticleId.cc \
            MFAlpha.cc \
-           MFSelBasic.cc \
-           MFSelStandard.cc \
-           MFSelFinal.cc \
            MFSoftwareTrigger.cc \
            MFCosmics.cc \