Changeset 6855 for trunk/MagicSoft/Mars/manalysis

Timestamp:

03/18/05 17:21:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (4 diffs)
• MCameraData.cc (modified) (16 diffs)
• MCameraData.h (modified) (2 diffs)
• MCerPhotAnal.cc (deleted)
• MCerPhotAnal.h (deleted)
• MCerPhotAnal2.cc (deleted)
• MCerPhotAnal2.h (deleted)
• MCerPhotCalc.cc (deleted)
• MCerPhotCalc.h (deleted)
• MCerPhotEvt.cc (deleted)
• MCerPhotEvt.h (deleted)
• MCerPhotPix.cc (deleted)
• MCerPhotPix.h (deleted)
• MSupercutsCalc.cc (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -4 +4 @@
 #pragma link off all classes;
 #pragma link off all functions;
-
-#pragma link C++ class MCerPhotPix+;
-#pragma link C++ class MCerPhotEvt+;
-#pragma link C++ class MCerPhotEvtIter+;
-#pragma link C++ class MCerPhotAnal+;
-#pragma link C++ class MCerPhotAnal2+;
-#pragma link C++ class MCerPhotCalc+;
 
 #pragma link C++ class MCameraData+;
@@ -27 +20 @@
 
 #pragma link C++ class MMatrixLoop+;
-/*
-#pragma link C++ class MSigmabar+;
-#pragma link C++ class MSigmabarCalc+;
-#pragma link C++ class MSigmabarParam+;
-*/
+
 #pragma link C++ class MEventRate+;
 #pragma link C++ class MEventRateCalc+;
@@ -38 +27 @@
 #pragma link C++ class MParameterD+;
 #pragma link C++ class MParameterDerr+;
-//#pragma link C++ class MParameters+;
 
 #pragma link C++ class MMcTriggerLvl2+;
@@ -49 +37 @@
 #pragma link C++ class MFiltercutsCalc+;
 
-//#pragma link C++ class MPad+;
 #pragma link C++ class MMcCalibrationUpdate+;
-//#pragma link C++ class MMakePadHistograms+;
 
 #endif

trunk/MagicSoft/Mars/manalysis/MCameraData.cc

@@ -45 +45 @@
 #include "MPedPhotPix.h"
 
-#include "MCerPhotEvt.h"
-#include "MCerPhotPix.h"
+#include "MSignalCam.h"
+#include "MSignalPix.h"
 
 #include "MSigmabar.h"
-#include "MArrivalTime.h"
 
 ClassImp(MCameraData);
@@ -57 +56 @@
 // --------------------------------------------------------------------------
 //
-// Creates a MCerPhotPix object for each pixel in the event
+// Creates a MSignalPix object for each pixel in the event
 //
 MCameraData::MCameraData(const char *name, const char *title)
@@ -99 +98 @@
 // FIXME: Should the check noise<=0 be replaced by MBadPixels?
 //
-void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &cam,
+void MCameraData::CalcCleaningLevel(const MSignalCam &evt, const MPedPhotCam &cam,
                                     const MGeomCam &geom)
 {
@@ -114 +113 @@
 
     // calculate cleaning levels
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = evt[i];
-
-        const Int_t idx = pix.GetPixId();
+    for (Int_t idx=0; idx<entries; idx++)
+    {
+        const MSignalPix &pix = evt[idx];
+
         const Float_t noise = cam[idx].GetRms();
 
@@ -145 +143 @@
 // FIXME: Should the check noise<=0 be replaced by MBadPixels?
 //
-void MCameraData::CalcCleaningLevel2(const MCerPhotEvt &evt, const MPedPhotCam &cam,
+void MCameraData::CalcCleaningLevel2(const MSignalCam &evt, const MPedPhotCam &cam,
                                      const MGeomCam &geom)
 {
@@ -164 +162 @@
     // calculate cleaning levels
     const Int_t entries = evt.GetNumPixels();
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = evt[i];
-
-        const Int_t   idx   = pix.GetPixId();
+    for (Int_t idx=0; idx<entries; idx++)
+    {
+        const MSignalPix &pix = evt[idx];
+
         const Float_t noise = cam[idx].GetRms();
 
@@ -189 +186 @@
 
 
-void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb,
+void MCameraData::CalcCleaningLevel(const MSignalCam &evt, const MSigmabar &sgb,
                                     const MGeomCam &geom)
 {
@@ -195 +192 @@
 }
 
-void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise,
+void MCameraData::CalcCleaningLevel(const MSignalCam &evt, Double_t noise,
                                     const MGeomCam &geom)
 {
@@ -213 +210 @@
     // calculate cleaning levels
     const Int_t entries = evt.GetNumPixels();
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = evt[i];
-
-        const Int_t idx = pix.GetPixId();
+    for (Int_t idx=0; idx<entries; idx++)
+    {
+        const MSignalPix &pix = evt[idx];
 
         //
@@ -237 +232 @@
 // FIXME: Should the check noise<=0 be replaced by MBadPixels?
 //
-void MCameraData::CalcCleaningLevelDemocratic(const MCerPhotEvt &evt, const MPedPhotCam &cam,
+void MCameraData::CalcCleaningLevelDemocratic(const MSignalCam &evt, const MPedPhotCam &cam,
                                               const MGeomCam &geom)
 {
@@ -256 +251 @@
     // calculate cleaning levels
     const Int_t entries = evt.GetNumPixels();
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = evt[i];
-
-        const Int_t idx     = pix.GetPixId();
+    for (Int_t idx=0; idx<entries; idx++)
+    {
+        const MSignalPix &pix = evt[idx];
+
         const Float_t noise = cam[idx].GetRms();
 
@@ -286 +280 @@
 // FIXME: Should the check noise<=0 be replaced by MBadPixels?
 //
-void MCameraData::CalcCleaningProbability(const MCerPhotEvt &evt, const MPedPhotCam &pcam,
-                                          const MGeomCam &geom,   const MArrivalTime *tcam)
+void MCameraData::CalcCleaningProbability(const MSignalCam &evt, const MPedPhotCam &pcam,
+                                          const MGeomCam &geom)
 {
     const Int_t n = geom.GetNumPixels();
@@ -307 +301 @@
     // Find pixel with max signal
     Int_t maxidx = 0;
-    if (tcam)
-    {
-        // Find pixel enty with maximum signal
-        for (Int_t i=0; i<entries; i++)
-        {
-            const Double_t s0 = evt[i].GetNumPhotons()      * geom.GetPixRatio(i);
-            const Double_t s1 = evt[maxidx].GetNumPhotons() * geom.GetPixRatio(maxidx);
-            if (s0>s1)
-                maxidx = i;
-        }
-
-        // Get software index of pixel
-        maxidx = evt[maxidx].GetPixId();
-    }
-
-    const Double_t timemean = tcam ? (*tcam)[maxidx] : 0;
+
+    // Find pixel entry with maximum signal
+    for (Int_t i=0; i<entries; i++)
+    {
+        const Double_t s0 = evt[i].GetNumPhotons()      * geom.GetPixRatio(i);
+        const Double_t s1 = evt[maxidx].GetNumPhotons() * geom.GetPixRatio(maxidx);
+        if (s0>s1)
+            maxidx = i;
+    }
+
+    const Double_t timemean = evt[maxidx].GetArrivalTime();
     const Double_t timerms  = 0.75; //[slices] rms time spread around highest pixel
 
     // calculate cleaning levels
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &spix = evt[i];
-
-        const Int_t   idx = spix.GetPixId();
+    for (Int_t idx=0; idx<entries; idx++)
+    {
+        const MSignalPix &spix = evt[idx];
+
         const Float_t rms = pcam[idx].GetRms();
         if (rms<=0) // fData[idx]=0, fValidity[idx]=0
@@ -342 +330 @@
 
         const Double_t signal  = spix.GetNumPhotons() * geom.GetPixRatio(idx) * ratio / rms;
-        const Double_t time    = tcam ? (*tcam)[idx] : 1;
+        const Double_t time    = evt[idx].GetArrivalTime();
 
         // if signal<0 the probability is equal 0
@@ -377 +365 @@
 // The level is the absolute number of photons times the area-ratio.
 //
-void MCameraData::CalcCleaningAbsolute(const MCerPhotEvt &evt, const MGeomCam &geom)
+void MCameraData::CalcCleaningAbsolute(const MSignalCam &evt, const MGeomCam &geom)
 {
     const Int_t n = geom.GetNumPixels();
@@ -391 +379 @@
 
     // calculate cleaning levels
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &spix = evt[i];
-
-        const Int_t idx = spix.GetPixId();
+    for (Int_t idx=0; idx<entries; idx++)
+    {
+        const MSignalPix &spix = evt[idx];
 
         // Set probability

trunk/MagicSoft/Mars/manalysis/MCameraData.h

@@ -17 +17 @@
 class MGeomCam;
 class MSigmabar;
-class MCerPhotEvt;
+class MSignalCam;
 class MPedPhotCam;
-class MArrivalTime;
 
 class MCameraData : public MParContainer, public MCamEvent
@@ -33 +32 @@
     UInt_t GetNumPixels() const { return fData.GetSize(); }
 
-    void CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &fCam,
+    void CalcCleaningLevel(const MSignalCam &evt, const MPedPhotCam &fCam,
                            const MGeomCam &geom);
-    void CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb,
+    void CalcCleaningLevel(const MSignalCam &evt, const MSigmabar &sgb,
                            const MGeomCam &geom);
-    void CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise,
+    void CalcCleaningLevel(const MSignalCam &evt, Double_t noise,
                            const MGeomCam &geom);
-    void CalcCleaningLevel2(const MCerPhotEvt &evt, const MPedPhotCam &fCam,
+    void CalcCleaningLevel2(const MSignalCam &evt, const MPedPhotCam &fCam,
                             const MGeomCam &geom);
-    void CalcCleaningLevelDemocratic(const MCerPhotEvt &evt, const MPedPhotCam &cam,
+    void CalcCleaningLevelDemocratic(const MSignalCam &evt, const MPedPhotCam &cam,
                                      const MGeomCam &geom);
-    void CalcCleaningProbability(const MCerPhotEvt &evt, const MPedPhotCam &pcam,
-                                 const MGeomCam &geom,   const MArrivalTime *tcam);
-    void CalcCleaningAbsolute(const MCerPhotEvt &evt, const MGeomCam &geom);
+    void CalcCleaningProbability(const MSignalCam &evt, const MPedPhotCam &pcam,
+                                 const MGeomCam &geom);
+    void CalcCleaningAbsolute(const MSignalCam &evt, const MGeomCam &geom);
 
     const TArrayD &GetData() const { return fData; }

trunk/MagicSoft/Mars/manalysis/MSupercutsCalc.cc

@@ -24 +24 @@
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-//   MSupercutsCalc                                                     //
-//                                                                         //
-//   this class calculates the hadronness for the supercuts                //
-//   the parameters of the supercuts are taken                             //
-//                  from the container MSupercuts                       //
-//                                                                         //
-//                                                                         //
+//
+//   MSupercutsCalc
+//
+//   this class calculates the hadronness for the supercuts
+//   the parameters of the supercuts are taken
+//                  from the container MSupercuts
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MSupercutsCalc.h"
@@ -46 +45 @@
 #include "MNewImagePar.h"
 #include "MMcEvt.hxx"
-#include "MCerPhotEvt.h"
 #include "MGeomCam.h"
 #include "MHadronness.h"

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -36 +36 @@
            MCompProbCalc.cc \
            MMultiDimDistCalc.cc \
-           MCerPhotPix.cc \
-           MCerPhotEvt.cc \
-           MCerPhotAnal.cc \
-           MCerPhotAnal2.cc \
-           MCerPhotCalc.cc \
            MEventRate.cc \
            MEventRateCalc.cc \