Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2404)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2405)
@@ -16,4 +16,13 @@
      - MHMcTriggerLvl2::GetHistByName removed const-qualifier and 
        changed return type to TH1 according to definition in MH.
+
+   * macros/status.C:
+     - use MDirIter instead of a single file name
+     - adde MHTriggerLvl0
+     - Simplified macro by using PrintOutliers
+
+   * mhist/MHCamEvent.[h,cc]:
+     - renamed PrintOutlayers to PrintOutliers
+     - Divide pad only into two subpads
 
 
Index: trunk/MagicSoft/Mars/macros/status.C
===================================================================
--- trunk/MagicSoft/Mars/macros/status.C	(revision 2404)
+++ trunk/MagicSoft/Mars/macros/status.C	(revision 2405)
@@ -31,5 +31,5 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void status(const char *fname="*1947*cosmic*.root")
+void status()
 {
     //
@@ -57,9 +57,7 @@
     plist.AddToList(&tlist);
 
-    /*
-     MSrcPosCam src;
-     src.SetXY(1./geomcam.GetConvMm2Deg(), 0);
-     plist.AddToList(&src);
-     */
+    // ------------- user change -----------------
+    MDirIter files("~MAGIC/online_data/rootdata", "*Mkn501-I*.root", -1);
+    //files.Print("all");
 
     //
@@ -69,7 +67,5 @@
     MReadMarsFile read("Events");
     read.DisableAutoScheme();
-
-    // ------------- user change -----------------
-    read.AddFile(fname);
+    read.AddFiles(files);
 
     MGeomApply        geomapl;
@@ -79,10 +75,8 @@
     MCerPhotCalc      ncalc;
 
-    TArrayS blinds(2);
-    blinds[0] = 271;
-    blinds[1] = 291;
+    TArrayS blinds(0);
 
     MBlindPixelCalc blind;
-    //blind.SetPixelIndices(blinds);
+    blind.SetPixelIndices(blinds);
     blind.SetUseInterpolation();
 
@@ -91,5 +85,4 @@
     MHillasCalc       hcalc;
     MHillasSrcCalc    scalc; // !!Preliminary!! Will be removed later!
-    MCT1SupercutsCalc calc1;
 
     MHCamEvent hist("PedestalRms");
@@ -98,4 +91,8 @@
 
     // -------------------------------------------
+    MHTriggerLvl0 trighi(254, "SaturationHi", "Saturation Rate of Hi Gains");
+    trighi.SetType(1);
+
+    MFillH fillhi(&trighi, "MRawEvtData");
     MFillH hfill0("Uncleaned [MHCamEvent]", "MCerPhotEvt");
     MFillH hfill1("Pedestals [MHCamEvent]", "MPedestalCam");
@@ -108,9 +105,10 @@
     MFillH hfill8("MHStarMap", "MHillas");
     MFillH hfill9("Cleaned [MHCamEvent]", "MCerPhotEvt");
-    MFillH hfill10("MHHadronness", "MHadronness");
-    MFillH hfill11("MHSigmaTheta");
+
+    MContinue cont1("MNewImagePar.fNumCorePixels<0");
 
     tlist.AddToList(&read);
     tlist.AddToList(&geomapl);
+    tlist.AddToList(&fillhi);
     tlist.AddToList(&pcopy);
     tlist.AddToList(&pnsb);
@@ -121,6 +119,6 @@
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
+    tlist.AddToList(&cont1);
     tlist.AddToList(&scalc);
-    //tlist.AddToList(&calc1);
     tlist.AddToList(&hfill1);
     tlist.AddToList(&hfill2);
@@ -132,5 +130,4 @@
     tlist.AddToList(&hfill8);
     tlist.AddToList(&hfill9);
-    //tlist.AddToList(&hfill10);
 
     MEvtLoop evtloop;
@@ -146,38 +143,11 @@
     tlist.PrintStatistics();
 
-    MHCamera &uncl = *((MHCamEvent*)plist.FindObject("Uncleaned"))->GetHistByName();
-    MHCamera &hped = *((MHCamEvent*)plist.FindObject("Pedestals"))->GetHistByName();
-    MHCamera &hrms = *((MHCamEvent*)plist.FindObject("PedestalRms"))->GetHistByName();
-
-    for (int i=0; i<577; i++)
-    {
-        if (uncl.IsUsed(i))
-        {
-            if (uncl[i+1]>uncl.GetMean()+3*uncl.GetRMS())
-                cout << "Mean Charge of Pixel-Index #" << i << ": " << uncl[i+1] << " > 3*rms" << endl;
-            if (uncl[i+1]==0)
-                cout << "Mean Charge of Pixel-Index #" << i << ": " << uncl[i+1] << " <= 0" << endl;
-            if (uncl[i+1]<uncl.GetMean()-3*uncl.GetRMS())
-                cout << "Mean Charge of Pixel-Index #" << i << ": " << uncl[i+1] << " < 3*rms" << endl;
-        }
-        if (hped.IsUsed(i))
-        {
-            if (hped[i+1]>hped.GetMean()+1.5*hped.GetRMS())
-                cout << "Mean Pedestal of Pixel-Index #" << i << ": " << hped[i+1] << " > 1.5*rms" << endl;
-            if (hped[i+1]==0)
-                cout << "Mean Pedestal of Pixel-Index #" << i << ": " << hped[i+1] << " <= 0" << endl;
-            if (hped[i+1]<hped.GetMean()-1.5*hped.GetRMS())
-                cout << "Mean Pedestal of Pixel-Index #" << i << ": " << hped[i+1] << " < 1.5*rms" << endl;
-        }
-        if (hrms.IsUsed(i))
-        {
-            if (hrms[i+1]>hrms.GetMean()+4*hrms.GetRMS())
-                cout << "Mean PedestalRMS of Pixel-Index #" << i << ": " << hrms[i+1] << " > 4*rms" << endl;
-            if (hrms[i+1]==0)
-                cout << "Mean PedestalRMS of Pixel-Index #" << i << ": " << hrms[i+1] << " <= 0" << endl;
-            if (hrms[i+1]<hrms.GetMean()-4*hrms.GetRMS())
-                cout << "Mean PedestalRMS of Pixel-Index #" << i << ": " << hrms[i+1] << " < 4*rms" << endl;
-        }
-    }
+    MHCamEvent *uncl = (MHCamEvent*)plist.FindObject("Uncleaned");
+    MHCamEvent *hped = (MHCamEvent*)plist.FindObject("Pedestals");
+    MHCamEvent *hrms = (MHCamEvent*)plist.FindObject("PedestalRms");
+    uncl->PrintOutliers(3);
+    hped->PrintOutliers(1.5);
+    hrms->PrintOutliers(4);
+    trighi.PrintOutliers(2.5);
 
     //
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 2404)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 2405)
@@ -136,5 +136,9 @@
 }
 
-void MHCamEvent::PrintOutlayers(Float_t s) const
+// --------------------------------------------------------------------------
+//
+// Print pixel indices which value is higher than mean+sigma*rms
+//
+void MHCamEvent::PrintOutliers(Float_t sigma) const
 {
     const Double_t mean = fSum->GetMean();
@@ -148,6 +152,6 @@
             continue;
 
-        if ((*fSum)[i+1]>mean+s*rms)
-            *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " > " << s << "*rms" << endl;
+        if ((*fSum)[i+1]>mean+sigma*rms)
+            *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " > " << sigma << "*rms" << endl;
         // if ((*fSum)[i+1]==0)
         //     *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " == 0" << endl;
@@ -171,5 +175,5 @@
     pad->SetBorderMode(0);
 
-    pad->Divide(2,2);
+    pad->Divide(1,2);
 
     pad->cd(1);
@@ -180,5 +184,5 @@
     fSum->Draw();
 
-    pad->cd(3);
+    pad->cd(2);
     gPad->SetBorderMode(0);
     fSum->Draw("EPhist");
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.h	(revision 2404)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.h	(revision 2405)
@@ -34,5 +34,5 @@
     void Draw(Option_t *o="");
 
-    void PrintOutlayers(Float_t s) const;
+    void PrintOutliers(Float_t sigma) const;
 
     ClassDef(MHCamEvent, 1) // Histogram to sum camera events