Index: trunk/MagicSoft/Mars/mtemp/mpisa/macros/readIPR.C
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mpisa/macros/readIPR.C	(revision 4991)
+++ trunk/MagicSoft/Mars/mtemp/mpisa/macros/readIPR.C	(revision 4992)
@@ -45,18 +45,20 @@
     plist.AddToList(&geom);
 
-    // First Task: Read ROOT file with REPORT data
-    MReportFileRead read(fname);
-    read.SetHasNoHeader();
-    // The Trigger container is added to the list
-    read.AddToList("MReportTrigger");
+    // First Task: Read ROOT file with Trigger-REPORT data
+    MReadTree read("Trigger", fname);
+    read.DisableAutoScheme();
+
     tlist.AddToList(&read);
 
+    // Create the container for the IPRs
+    MTriggerIPR ipr;
+    plist.AddToList(&ipr);
 
-    MHCamEvent IPRcam("IPRcam","IPRs");
-    plist.AddToList(&IPRcam);
-    // create a task to fill a histogram
-    //    MFillH fill("MHCamEvent", "MTriggerIPR");
-
-    MFillH fillIPR(&IPRcam, "MTriggerIPR");
+    // Create the histo to display the IPRs
+    MHCamEvent IPRhist("IPRhist","IPRs");
+    plist.AddToList(&IPRhist);
+        
+    // create a task to fill a histogram from the container
+    MFillH fillIPR(&IPRhist, "MTriggerIPR");
     tlist.AddToList(&fillIPR);
 
@@ -68,18 +70,20 @@
 
     //
-    // Execute your analysis
+    // Execute the analysis
     //
+    if (!evtloop.PreProcess())
+      return;
+    
     if (!evtloop.Eventloop())
-        return;
+      return;
 
     tlist.PrintStatistics();
 
-    //
+    //-----------------------------------
     // Now display the result of the loop
     //
 
-    //    MHCamEvent &h2 = *(MHCamEvent*)plist->FindObject("MHCamEvent");
-    //    MHCamera &h = *(MHCamera*)h2.GetHistByName("sum");
-    MHCamera &h = *(MHCamera*)IPRcam.GetHistByName("sum");
+    // create a MHCamera histo where the sum off all events is filled
+    MHCamera &h = *(MHCamera*)IPRhist.GetHistByName("sum");
 
     TCanvas *c = MH::MakeDefCanvas();
@@ -92,7 +96,7 @@
     disp3->SetCamContent(h, 2);
 
-    disp1->SetYTitle("I [nA]");
-    disp2->SetYTitle("\\sigma_{I} [\\mu A]");
-    disp3->SetYTitle("\\sigma_{I} [%]");
+    disp1->SetYTitle("Rate [Hz]");
+    disp2->SetYTitle("\\sigma_{Rate} [Hz]");
+    disp3->SetYTitle("\\sigma_{Rate} [%]");
     disp1->SetName("IPRs;avg");
     disp2->SetName("IPRs;err");
@@ -139,5 +143,5 @@
 
     c->SaveAs(fname(0, fname.Last('.')+1) + "ps");
-    c->SaveAs(fname(0, fname.Last('.')+1) + "root");
+    //c->SaveAs(fname(0, fname.Last('.')+1) + "root");
 }