Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4971)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4972)
@@ -19,4 +19,14 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/13: Antonio Stamerra
+
+   * mtrigger/MTrigger*.h:
+     - removed inheritance from MCamEvent (except MTriggerIPR).
+     - Added Get... functions to retrieve the data members
+
+   * mreport/MReportTrigger.[h,cc]
+     - added fTriggerTable, fL1(L2)Triggertable to the data members
+
 
  2004/09/13: Markus Gaug 
Index: /trunk/MagicSoft/Mars/mtemp/mpisa/Changelog_pisa
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mpisa/Changelog_pisa	(revision 4971)
+++ /trunk/MagicSoft/Mars/mtemp/mpisa/Changelog_pisa	(revision 4972)
@@ -18,4 +18,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/09/13: Antonio Stamerra
+
+   * mpisa/macros/readIPR.C
+     - macro to read IPRs
+
+
  2004/05/24: Antonio Stamerra
 
Index: /trunk/MagicSoft/Mars/mtemp/mpisa/macros/readIPR.C
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mpisa/macros/readIPR.C	(revision 4972)
+++ /trunk/MagicSoft/Mars/mtemp/mpisa/macros/readIPR.C	(revision 4972)
@@ -0,0 +1,143 @@
+///////////////////////////////////////////////////////////////////////////
+// 
+//    readIPR.C
+//
+//   This macro shows how to read the Individual Pixel Rates from 
+//   a CC report file.
+//
+//   Input: 
+//     - root file obtained merpping a .rep CC file
+//       container: MTriggerIPR
+//
+//   Output:
+//     - a camera display showing the IPRs
+//     - Some histos for checking purposes
+//   
+//   Note: 
+//     a similar macro can be used to read the following trigger containers:
+//     - MTriggerIPR        (Individual Pixel Rates)
+//     - MTriggerCell       (Rate of trigger cells)
+//     - MTriggerBit        (Output Bits from prescaler (before/after presc.)
+//     - MTriggerPrescFact  (Prescaling factors for each bit)
+//     - MTriggerLiveTime   (Values of counters for dead/livetime)
+//
+//    Author(s): Antonio Stamerra. 09/04 <antonio.stamerra@pi.infn.it>
+//
+////////////////////////////////////////////////////////////////////////////
+void readIPR(TString fname)
+{
+    //
+    // Create a empty Parameter List and an empty Task List
+    // The tasklist is identified in the eventloop by its name
+    //
+    MParList  plist;
+
+    MTaskList tlist;
+    plist.AddToList(&tlist);
+
+    //
+    // Now setup the tasks and tasklist:
+    // ---------------------------------
+    //
+
+    // Create the magic geometry
+    MGeomCamMagic geom;
+    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");
+    tlist.AddToList(&read);
+
+
+    MHCamEvent IPRcam("IPRcam","IPRs");
+    plist.AddToList(&IPRcam);
+    // create a task to fill a histogram
+    //    MFillH fill("MHCamEvent", "MTriggerIPR");
+
+    MFillH fillIPR(&IPRcam, "MTriggerIPR");
+    tlist.AddToList(&fillIPR);
+
+    //
+    // Create and setup the eventloop
+    //
+    MEvtLoop evtloop;
+    evtloop.SetParList(&plist);
+
+    //
+    // Execute your analysis
+    //
+    if (!evtloop.Eventloop())
+        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");
+
+    TCanvas *c = MH::MakeDefCanvas();
+    c->Divide(3, 2);
+
+    MHCamera *disp1=h.Clone();
+    MHCamera *disp2=h.Clone();
+    MHCamera *disp3=h.Clone();
+    disp2->SetCamContent(h, 1);
+    disp3->SetCamContent(h, 2);
+
+    disp1->SetYTitle("I [nA]");
+    disp2->SetYTitle("\\sigma_{I} [\\mu A]");
+    disp3->SetYTitle("\\sigma_{I} [%]");
+    disp1->SetName("IPRs;avg");
+    disp2->SetName("IPRs;err");
+    disp3->SetName("IPRs;rel");
+    disp1->SetTitle("IPRs Average");
+    disp2->SetTitle("IPRs error");
+    disp3->SetTitle("IPRs relative error");
+
+    c->cd(1);
+    TText text(0.1, 0.95, &fname[fname.Last('/')+1]);
+    text.SetTextSize(0.03);
+    text.DrawClone();
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetLogy();
+    disp1->Draw();
+    disp1->SetBit(kCanDelete);
+    c->cd(2);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetLogy();
+    disp2->Draw();
+    disp2->SetBit(kCanDelete);
+    c->cd(3);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetLogy();
+    disp3->Draw();
+    disp3->SetBit(kCanDelete);
+    c->cd(4);
+    gPad->SetBorderMode(0);
+    disp1->Draw("EPhist");
+    c->cd(5);
+    gPad->SetBorderMode(0);
+    gPad->SetLogy();
+    disp2->Draw("Phist");
+    c->cd(6);
+    gPad->SetBorderMode(0);
+    gPad->SetLogy();
+    disp3->Draw("Phist");
+
+    c->SaveAs(fname(0, fname.Last('.')+1) + "ps");
+    c->SaveAs(fname(0, fname.Last('.')+1) + "root");
+}
+