Index: trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc	(revision 1965)
@@ -71,5 +71,5 @@
 
 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)";
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.h	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.h	(revision 1965)
@@ -27,5 +27,5 @@
     MParameterD  *fHourAngle;
 
-    Float_t      fMm2Deg;
+    Float_t       fMm2Deg;
 
 public:
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 1965)
@@ -64,5 +64,5 @@
 {
     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");
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1965)
@@ -27,4 +27,5 @@
 
 #include <math.h>
+#include <limits.h>
 #include <fstream.h>
 
@@ -120,4 +121,6 @@
     {
         const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         if (id == pix.GetPixId() && pix.IsPixelUsed())
@@ -139,4 +142,6 @@
     {
         const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         if (id == pix.GetPixId() && pix.IsPixelCore())
@@ -160,9 +165,11 @@
     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,9 +202,11 @@
     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,4 +238,6 @@
     {
         const MCerPhotPix &pix = (*this)[i];
+        if (!pix.IsPixelUsed())
+            continue;
 
         Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot();
@@ -247,9 +258,11 @@
         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,9 +285,11 @@
         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,9 +315,11 @@
         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,2 +385,7 @@
 }
 */
+
+void MCerPhotEvt::Scale(Double_t f)
+{
+    fPixels->ForEach(MCerPhotPix, Scale)(f);
+}
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 1965)
@@ -48,4 +48,6 @@
     MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
 
+    void Scale(Double_t f);
+
     MCerPhotPix *GetPixById(int id) const;
 
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h	(revision 1965)
@@ -48,4 +48,6 @@
     void    AddNumPhotons(Float_t f)    { fPhot += f; }
 
+    void    Scale(Float_t f)            { fPhot/=f; }
+
     void    Print(Option_t *opt = NULL) const;
 
Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 1965)
@@ -57,5 +57,5 @@
 {
     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";
 
     //
Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc	(revision 1961)
+++ trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc	(revision 1965)
@@ -79,5 +79,5 @@
 {
     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";
 
     //
