Changeset 1965 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/19/03 18:39:05 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MBlindPixelCalc.cc (modified) (1 diff)
• MCT1PointingCorrCalc.h (modified) (1 diff)
• MCerPhotCalc.cc (modified) (1 diff)
• MCerPhotEvt.cc (modified) (10 diffs)
• MCerPhotEvt.h (modified) (1 diff)
• MCerPhotPix.h (modified) (1 diff)
• MMcPedestalCopy.cc (modified) (1 diff)
• MMcPedestalNSBAdd.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc ¶

@@ -71 +71 @@
 
 static const TString gsDefName  = "MBlindPixelCalc";
-static const TString gsDefTitle = "Task to deal with hot spots (star, broken pixels, etc)";
+static const TString gsDefTitle = "Find hot spots (star, broken pixels, etc)";
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.h ¶

@@ -27 +27 @@
     MParameterD  *fHourAngle;
 
-    Float_t      fMm2Deg;
+    Float_t       fMm2Deg;
 
 public:

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc ¶

@@ -64 +64 @@
 {
     fName  = name  ? name  : "MCerPhotCalc";
-    fTitle = title ? title : "Task to calculate pixel signal from raw data";
+    fTitle = title ? title : "Calculate pixel signal from FADC data";
 
     AddToBranchList("MRawEvtData.fHiGainPixId");

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc ¶

@@ -27 +27 @@
 
 #include <math.h>
+#include <limits.h>
 #include <fstream.h>
 
@@ -120 +121 @@
     {
         const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         if (id == pix.GetPixId() && pix.IsPixelUsed())
@@ -139 +142 @@
     {
         const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         if (id == pix.GetPixId() && pix.IsPixelCore())
@@ -160 +165 @@
     const UInt_t n = geom->GetNumPixels();
 
-    Float_t minval = (*this)[0].GetNumPhotons();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
-    {
-        const MCerPhotPix &pix = (*this)[i];
+    Float_t minval = FLT_MAX;
+
+    for (UInt_t i=1; i<fNumPixels; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         const UInt_t id = pix.GetPixId();
@@ -195 +202 @@
     const UInt_t n = geom->GetNumPixels();
 
-    Float_t maxval = (*this)[0].GetNumPhotons();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
-    {
-        const MCerPhotPix &pix = (*this)[i];
+    Float_t maxval = -FLT_MAX;
+
+    for (UInt_t i=1; i<fNumPixels; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         const UInt_t id = pix.GetPixId();
@@ -229 +238 @@
     {
         const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot();
@@ -247 +258 @@
         return -5.;
 
-    Float_t maxval = (*this)[0].GetNumPhotons()/(*this)[0].GetErrorPhot();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
-    {
-        const MCerPhotPix &pix = (*this)[i];
+    Float_t maxval = -FLT_MAX;
+
+    for (UInt_t i=1; i<fNumPixels; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot();
@@ -272 +285 @@
         return 50.;
 
-    Float_t minval = (*this)[0].GetErrorPhot();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
-    {
-        const MCerPhotPix &pix = (*this)[i];
+    Float_t minval = FLT_MAX;
+
+    for (UInt_t i=1; i<fNumPixels; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         Float_t testval = pix.GetErrorPhot();
@@ -300 +315 @@
         return 50.;
 
-    Float_t maxval = (*this)[0].GetErrorPhot();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
-    {
-        const MCerPhotPix &pix = (*this)[i];
+    Float_t maxval = -FLT_MAX;
+
+    for (UInt_t i=1; i<fNumPixels; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         Float_t testval = pix.GetErrorPhot();
@@ -368 +385 @@
 }
 */
+
+void MCerPhotEvt::Scale(Double_t f)
+{
+    fPixels->ForEach(MCerPhotPix, Scale)(f);
+}

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h ¶

@@ -48 +48 @@
     MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
 
+    void Scale(Double_t f);
+
     MCerPhotPix *GetPixById(int id) const;
 

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h ¶

@@ -48 +48 @@
     void    AddNumPhotons(Float_t f)    { fPhot += f; }
 
+    void    Scale(Float_t f)            { fPhot/=f; }
+
     void    Print(Option_t *opt = NULL) const;
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc ¶

@@ -57 +57 @@
 {
     fName  = name  ? name  : "MMcPedestalCopy";
-    fTitle = title ? title : "Task to copy monte carlo pedestals into MPedestal Container";
+    fTitle = title ? title : "Copy MC pedestals into MPedestal Container";
 
     //

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc ¶

@@ -79 +79 @@
 {
     fName  = name  ? name  : "MMcPedestalNSBAdd";
-    fTitle = title ? title : "Task to copy monte carlo pedestals into MPedestal Container";
+    fTitle = title ? title : "Add diffuse NSB to the pedestal signal";
 
     //