Changeset 9067 for trunk

Timestamp:

08/01/08 14:41:58 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• datacenter/macros/plotdb.C (modified) (4 diffs)
• mbase/MStatusDisplay.cc (modified) (3 diffs)
• mbase/MStatusDisplay.h (modified) (1 diff)
• mjobs/MJCut.cc (modified) (2 diffs)
• mjobs/MJSpectrum.cc (modified) (1 diff)

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

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.50 2008-07-20 17:33:22 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.51 2008-08-01 13:41:57 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -550 +550 @@
     //inner camera
     //from calib*.root
+    plot.SetDescription("Median number of calibration phe in inner pixels;C [phe]", "CalPheI");
+    plot.Plot("Calibration.fMedNumPheInner", 0, 200, 1);
+    plot.SetDescription("Relative rms of calibration charge inner pixels;\\sigma_C [%]", "CalRmsI");
+    plot.Plot("Calibration.fRelChargeRmsInner", 0, 0.5, 0.01);
     plot.SetDescription("Conversion Factor inner Camera;C_{I} [phe/fadc cnts]", "ConvI");
     plot.Plot("Calibration.fConvFactorInner",  0, 0.7, 0.002);
@@ -605 +609 @@
     //plot.SetDescription("Pulse Variance;", "PulVar");
     //plot.Plot("Calibration.fPulsePosVar", 0, 0.03, 0.001);
-
 
     //from star*.root
@@ -668 +671 @@
     //outer camera
     //from calib*.root
+    plot.SetDescription("Median number of calibration phe in outer pixels;C [phe]", "CalPheO");
+    plot.Plot("Calibration.fMedNumPheOuter", 0, 200, 1);
+    plot.SetDescription("Relative rms of calibration charge outer pixels;\\sigma_C [%]", "CalRmsO");
+    plot.Plot("Calibration.fRelChargeRmsOuter", 0, 0.5, 0.01);
     plot.SetDescription("Conversion Factor outer Camera;C_{O} [phe/fadc cnts]", "ConvO");
     plot.Plot("Calibration.fConvFactorOuter",  0, 3.0, 0.01);

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2550 +2550 @@
         }
 
+        if (name.Index("%%%%title%%%%"))
+        {
+            name.ReplaceAll("%%title%%", c->GetTitle());
+            found = kTRUE;
+        }
+
         if (name.Index("%%%%tab%%%%"))
         {
@@ -2706 +2712 @@
         //
         const Double_t height = 0.015;  // Text height
-        const Double_t off    = 0.005;  // Line offset from Text
+        const Double_t off    = 0.005;  // Line offset from text
 
         const Double_t bot = height+off;
@@ -2990 +2996 @@
 }
 
+/*
+Bool_t MStatusDisplay::SaveAsCSV(Int_t num, TString name)
+{
+    num = InitWriteDisplay(num, name, "csv");
+    if (num==0)
+        return kFALSE;
+
+    gSystem->ExpandPathName(name);
+
+    ofstream fout(name);
+    if (!fout)
+    {
+        *fLog << err << "Cannot open file " << name << ": " << strerror(errno) << endl;
+        return kFALSE;
+    }
+
+    fout << "<?xml version=\"1.0\"?>" << endl;
+    fout << "<display name='" << GetName() << "'>" << endl;
+    fout << "   <file>" << name << "</file>" << endl;
+    fout << "   <status>" << endl;
+    fout << "      <name>" << GetName() << "</name>" << endl;
+    fout << "      <title>" << GetTitle() << "</title>" << endl;
+    fout << "   </status>" << endl;
+    fout << "   <tabs>" << endl;
+
+    fout << 0 << delim << GetName() << delim << GetTitle() << endl;
+
+    Int_t from, to;
+    GetCanvasRange(from, to, num);
+
+    for (int i=from; i<to; i++)
+    {
+        TCanvas *c;
+        if (!(c = GetCanvas(i)))
+        {
+            if (num<0)
+                *fLog << inf << " - ";
+            *fLog << "Tab #" << i << " doesn't contain an embedded Canvas... skipped." << endl;
+            continue;
+        }
+
+        fout << "      <tab index='" << i << "'>" << endl;
+        fout << "         <index>" << i << "</index>" << endl;
+        fout << "         <name>" << c->GetName()  << "</name>" << endl;
+        fout << "         <title>" << c->GetName()  << "</title>" << endl;
+        fout << "      </tab>" << endl;
+    }
+
+    fout << "  </tabs>" << endl;
+    fout << "</display>" << endl;
+
+    SetStatusLine2("Done.");
+
+    return kTRUE;
+}
+*/
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -269 +269 @@
 
      Bool_t SaveAsCSV(Int_t num, TString name="", Char_t delim='\t');
+     //Bool_t SaveAsXML(Int_t num, TString name="",);
      Int_t  PrintPS(Int_t num, const char *p=0, const char *cmd=0, const char *tmp=0);
      Bool_t PrintLog(const char *p=0, const char *c=0);

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -394 +394 @@
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");
-    write->AddContainer("RunNumber",      "Events");
+    write->AddContainer("FileId",         "Events");
     write->AddContainer("EvtNumber",      "Events");
     //    write->AddContainer("MMuonSearchPar", "Events", kFALSE);
@@ -716 +716 @@
     setevtnum.SetNameParameter("EvtNumber");
 
-    MParameterCalc setrunnum("MRawRunHeader.fRunNumber", "SetRunNumber");
-    setrunnum.SetNameParameter("RunNumber");
+    MParameterCalc setrunnum("MRawRunHeader.GetFileID", "SetFileId");
+    setrunnum.SetNameParameter("FileId");
 
     MFillH fill1a("MHHillasOffPre  [MHHillas]",      "MHillas",      "FillHillasPre");

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1477 +1477 @@
     write->AddContainer("MWeight",        "Events");
     write->AddContainer("DataType",       "Events");
-    write->AddContainer("RunNumber",      "Events");
+    write->AddContainer("FileId",         "Events");
     write->AddContainer("EvtNumber",      "Events");
 }