Changeset 8954 for trunk

Timestamp:

06/14/08 11:16:05 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/plotdb.C (modified) (2 diffs)
• mars.cc (modified) (1 diff)
• mastro/MAstro.cc (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (3 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2008/06/14 Thomas Bretz
+
+   * mtrigger/MFTriggerPattern.cc:
+     - improved documentation
+
+   * mars.cc, mbase/MStatusDisplay.cc:
+     - changed the M in MARS to "Modular"
+     - rpelaced year in copyright by current year
+
+   * datacenter/macros/plotdb.C:
+     - increased range for the rate of the calibration events
+
+   * mastro/MAstro.cc:
+     - included math.h for darwin
+
+   * mjobs/MJCalibrateSignal.cc:
+     - changed the named of the MFTriggerPattern
+
+
 
 

trunk/MagicSoft/Mars/datacenter/macros/plotdb.C

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.41 2008-06-12 17:35:26 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.42 2008-06-14 10:16:04 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -564 +564 @@
     //plot.Plot("100*Calibration.fRateSumEvts/Calibration.fRateTrigEvts", 0, 500, 1);
     plot.SetDescription("Average rate of events with calibration trigger;R [Hz]", "RateCal");
-    plot.Plot("Calibration.fRateCalEvts", 0, 50, 1);
+    plot.Plot("Calibration.fRateCalEvts", 0, 75, 1);
     plot.SetDescription("Average rate of events with pedestal trigger;R [Hz]", "RatePed");
     plot.Plot("Calibration.fRatePedEvts", 0, 50, 1);

trunk/MagicSoft/Mars/mars.cc

@@ -36 +36 @@
     gLog << "==================================================" << endl;
     gLog << "                    MARS V" << MARSVER              << endl;
-    gLog << "    Magic Analysis and Reconstruction Software"     << endl;
+    gLog << "   Modular Analysis and Reconstruction Software"    << endl;
     gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
     gLog << "==================================================" << endl;

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -30 +30 @@
 ////////////////////////////////////////////////////////////////////////////
 #include "MAstro.h"
+
+#include <math.h>     // fmod on darwin
 
 #include <iostream>

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -478 +478 @@
 
     // Add copyright notice
-    l = new TGLabel(f, "(c) MAGIC Software Development, 2000-2007");
+    l = new TGLabel(f, Form("(c) MARS Software Development, 2000-%d", MTime(-1).Year());
     fList->Add(l);
     f->AddFrame(l, layb);
@@ -2607 +2607 @@
         PSToolsTextNDC(*ps, 0, 1.015, TString("  ")+n->GetName());
         ps->SetTextAlign(21); // cent top
-        PSToolsTextNDC(*ps, 0.5, 1.015, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString());
+        PSToolsTextNDC(*ps, 0.5, 1.015, TString("MARS V"MARSVER" - Modular Analysis and Reconstruction Software - ")+d.AsString());
         ps->SetTextAlign(31); // right top
         PSToolsTextNDC(*ps, 1, 1.015, MString::Format("Page No.%i (%i)  ", page++, i));
@@ -2619 +2619 @@
             PSToolsTextNDC(*ps, 0, -0.015, TString("  ")+txt);
             ps->SetTextAlign(31); // right top
-            PSToolsTextNDC(*ps, 1, -0.015, "(c) 2000-2007, Thomas Bretz  ");
+            PSToolsTextNDC(*ps, 1, -0.015, Form("(c) 2000-%d, Thomas Bretz  ", MTime(-1).Year()));
         }
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -440 +440 @@
     // calibration events in such data, so this is fine.
     // We allow only cosmics triggered events to pass (before prescaling)
-    MFTriggerPattern fcalped;
+    MFTriggerPattern fcalped("SelectTrigEvts");
     fcalped.SetInverted();
     fcalped.SetDefault(kTRUE);
@@ -449 +449 @@
 
     // This will skip interleaved events with a cal- or ped-trigger
-    MContinue contcalped(&fcalped, "ContTrigPattern");
+    MContinue contcalped(&fcalped, "ContNonTrigger");
 
     // Create the pedestal subtracted raw-data
@@ -576 +576 @@
     // trigger pattern is available do not execute it
     // The selection is done before prescaling.
-    MFTriggerPattern        fcalib("CalibFilter");
+    MFTriggerPattern        fcalib("SelectCalEvts");
     fcalib.SetDefault(kFALSE);
     fcalib.DenyAll();