Changeset 8987 for trunk

Timestamp:

06/30/08 09:46:36 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (7 diffs)
• datacenter/macros/plotdb.C (modified) (3 diffs)
• msql/MSQLMagic.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/06/30 Thomas Bretz
+
+   * datacenter/macros/fillstar.C:
+     - check whether graphs are empty in a more accurate way
+
+   * datacenter/macros/plotdb.C:
+     - fixed some axis title
+     - increased range of fRatePedTrigEvts
+
+   * msql/MSQLMagic.cc:
+     - added ' around the where clause in UpdateInsert to allowe
+       also for times etc
+
+
 
  2008/06/21 Thomas Bretz

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

@@ -80 +80 @@
 using namespace std;
 
+bool CheckGraph(const TGraph *g)
+{
+    return g && g->GetN()>0 && !(g->GetN()==1 && g->GetX()[0]==0);
+}
+
 int Process(MSQLMagic &serv, TString fname)
 {
@@ -183 +188 @@
         return 2;
     }
-    TString maxhum = g->GetN()>0 ? Form("%5.1f", TMath::MaxElement(g->GetN(), g->GetY())) : "NULL";
-    TString avghum = g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL";
+    TString maxhum = CheckGraph(g) ? Form("%5.1f", TMath::MaxElement(g->GetN(), g->GetY())) : "NULL";
+    TString avghum = CheckGraph(g) ? Form("%5.1f", g->GetMean(2)) : "NULL";
 
     g = (TGraph*)arr.FindObjectInCanvas("Temperature", "TGraph", "MHWeather");
@@ -192 +197 @@
         return 2;
     }
-    TString avgtemp = g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL";
+    TString avgtemp = CheckGraph(g) ? Form("%5.1f", g->GetMean(2)) : "NULL";
 
     g = (TGraph*)arr.FindObjectInCanvas("WindSpeed", "TGraph", "MHWeather");
@@ -200 +205 @@
         return 2;
     }
-    TString avgwind = g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL";
+    TString avgwind = CheckGraph(g) ? Form("%5.1f", g->GetMean(2)) : "NULL";
 
     g = (TGraph*)arr.FindObjectInCanvas("Cloudiness", "TGraph", "MHWeather");
     if (!g)
         cout << "WARNING - Reading of Cloudiness failed." << endl;
-    TString avgclouds = g && g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL";
-    TString rmsclouds = g && g->GetN()>0  ? Form("%5.1f", g->GetRMS(2))  : "NULL";
+
+    TString avgclouds = CheckGraph(g) ? Form("%5.1f", g->GetMean(2)) : "NULL";
+    TString rmsclouds = CheckGraph(g) ? Form("%5.1f", g->GetRMS(2))  : "NULL";
 
     g = (TGraph*)arr.FindObjectInCanvas("TempSky", "TGraph", "MHWeather");
     if (!g)
         cout << "WARNING - Reading of TempSky failed." << endl;
-    TString avgsky = g && g->GetN()>0 ? Form("%5.1f", g->GetMean(2)+200) : "NULL";
+    TString avgsky = CheckGraph(g) ? Form("%5.1f", g->GetMean(2)+200) : "NULL";
 
 
@@ -218 +224 @@
         cout << "WARNING - Reading of NumStars failed." << endl;
 
-    TString numstarsmed = g && g->GetN()>0 ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL";
-    TString numstarsrms = g && g->GetN()>0  ? Form("%5.1f", g->GetRMS(2)) : "NULL";
+    TString numstarsmed = CheckGraph(g) ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL";
+    TString numstarsrms = CheckGraph(g) ? Form("%5.1f", g->GetRMS(2)) : "NULL";
 
     g = (TGraph*)arr.FindObjectInCanvas("NumStarsCor", "TGraph", "MHPointing");
@@ -225 +231 @@
         cout << "WARNING - Reading of NumStarsCor failed." << endl;
 
-    TString numcorsmed = g && g->GetN()>0  ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL";
-    TString numcorsrms = g && g->GetN()>0  ? Form("%5.1f", g->GetRMS(2)) : "NULL";
+    TString numcorsmed = CheckGraph(g) ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL";
+    TString numcorsrms = CheckGraph(g) ? Form("%5.1f", g->GetRMS(2)) : "NULL";
 
     g = (TGraph*)arr.FindObjectInCanvas("Brightness", "TGraph", "MHPointing");
@@ -232 +238 @@
         cout << "WARNING - Reading of SkyBrightness failed." << endl;
 
-    TString skybrightnessmed = g && g->GetN()>0  ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL";
-    TString skybrightnessrms = g && g->GetN()>0  ? Form("%5.1f", g->GetRMS(2)) : "NULL";
+    TString skybrightnessmed = CheckGraph(g) ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL";
+    TString skybrightnessrms = CheckGraph(g) ? Form("%5.1f", g->GetRMS(2)) : "NULL";
 
     TString sequence = fname(TRegexp("star[0-9]+[.]root$"));

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

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.46 2008-06-21 13:53:33 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.47 2008-06-30 08:46:03 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -539 +539 @@
     plot.SetDescription("RMS Arrival Time inner Camera;\\sigma_{T,I} [sl]", "RmsArrTmI");
     plot.Plot("Calibration.fArrTimeRmsInner",  0, 4.5, 0.01);
-    plot.SetDescription("Number of unsuitable pixels inner Camera;N{I}", "UnsuitI");
+    plot.SetDescription("Number of unsuitable pixels inner Camera;N_{I}", "UnsuitI");
     plot.Plot("Calibration.fUnsuitableInner",  0, 75, 1);
     plot.SetDescription("Number of unsuitable pixels >50%;N", "Unsuit50");
@@ -575 +575 @@
     plot.Plot("Calibration.fRatePedEvts", 0, 50, 1);
     plot.SetDescription("Average rate of events with ped+cosmics trigger;R [Hz]", "RatePT");
-    plot.Plot("Calibration.fRatePedTrigEvts", 0, 3.5, 0.1);
+    plot.Plot("Calibration.fRatePedTrigEvts", 0, 4.0, 0.1);
     plot.SetDescription("Average rate of events without trigger pattern;R [Hz]", "Rate0");
     plot.Plot("Calibration.fRateNullEvts", 0, 3.5, 0.1);

trunk/MagicSoft/Mars/msql/MSQLMagic.cc

@@ -290 +290 @@
 {
     return ExistStr(col, table, val) ?
-        Update(table, vars, Form("%s=%s", col, val)) :
-        Insert(table, vars, Form("%s=%s", col, val));
+        Update(table, vars, Form("%s='%s'", col, val)) :
+        Insert(table, vars, Form("%s='%s'", col, val));
 }