Changeset 4430 for trunk

Timestamp:

07/28/04 11:27:02 (20 years ago)

Author:

jlopez

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamera.cc (modified) (1 diff)
• mhist/MHCamera.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/07/28: Javi Lopez
+
+   * mhist/MHCamera.[h,cc]
+     - Added new argument to CntCamContent() funtion to select to count
+       the events above or bellow a certain discriminator level.
 
  2004/07/20: Florian Goebel

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1229 +1229 @@
             Fill(idx);
         if (val<threshold && !isabove)
+            Fill(idx);
+    }
+    fEntries++;
+}
+
+// ------------------------------------------------------------------------
+//
+// Call this function to add a MCamEvent on top of the present contents.
+// 1 is added to each pixel if the contents of MCamEvent>threshold (in case isabove is set to kTRUE == default)
+// 1 is added to each pixel if the contents of MCamEvent<threshold (in case isabove is set to kFALSE)
+//
+void MHCamera::CntCamContent(const MCamEvent &event, TArrayD threshold, Int_t type, Bool_t isabove)
+{
+    if (fNcells<=1 || IsFreezed())
+        return;
+
+    // FIXME: Security check missing!
+    for (Int_t idx=0; idx<fNcells-2; idx++)
+    {
+        Double_t val=threshold[idx];
+        if (event.GetPixelContent(val, idx, *fGeomCam, type)/* && !IsUsed(idx)*/)
+            SetUsed(idx);
+
+        if (val>threshold[idx] && isabove)
+            Fill(idx);
+        if (val<threshold[idx] && !isabove)
             Fill(idx);
     }

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -10 +10 @@
 #ifndef ROOT_TArrayI
 #include <TArrayI.h>
+#endif
+#ifndef ROOT_TArrayD
+#include <TArrayD.h>
 #endif
 #ifndef ROOT_TClonesArray
@@ -151 +154 @@
 
     virtual void     CntCamContent(const MCamEvent &evt, Double_t threshold, Int_t type=0, Bool_t isabove=kTRUE);
+    virtual void     CntCamContent(const MCamEvent &evt, TArrayD threshold, Int_t type=0, Bool_t isabove=kTRUE);
     virtual void     CntCamContent(const TArrayD &evt, Double_t threshold, Bool_t ispos=kTRUE);