Changeset 8924 for trunk

Timestamp:

06/06/08 16:44:02 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2008/06/06 Thomas Bretz
+
+   * datacenter/macros/fillstar.C:
+     - added windspeed and temperature
+
+
+
+ 2008/06/03 Thomas Bretz
+
+   * mbase/MStatusDisplay.cc:
+     - added missing inclusion of TMath (root 5.18)
+     - initialize gClient in batch mode to repair broken
+       batch-mode in root 5.18. Fortunately this doesn't
+       break root 5.12
+     - added a SaveAs(const char *c, const Option_t *o)
+       based on the new SaveAs from TGObject
+
+   * mcalib/MCalibrationChargePix.[h,cc],
+     mextralgo/MExtralgoDigitalFilter.[h,cc]:
+     - moved some code to source file to prevent TMath inclusion in
+       header (root 5.18)
+
+   * mcalib/MCalibrationChargeCam.cc, 
+     mcalib/MCalibrationChargePINDiode.cc:
+     - added the missing inclusion of TMath
+
+   * mgeom/MGeomCam.[h,cc]:
+     - for sanity (a bug in root < 5.18) filling fPixels is now 
+       done via AddAt. This "repairs" the functionality of the
+       Streamer which before didn't store any contants of fPixels
+       nor read any contents.
+     - Removed the custom Clone function. It is now obsolete,
+       because it works through the fixed Streamer
+     - a Copy-member function has been implemented
+     - a custom Streamer has been implemented allowing to read
+       files containing MGeomCamMagic written with root 5.12 
+       with root 5.18
+     - A member function containing the workaround has been implemented
+     - Print got an option ("simple")
+
+   * mgeom/GeomLinkDef.h:
+     - suppress root-Streamer
+
+   * manalysis/MGeomApply.cc:
+     - added the newly necessary call to the StreamerWorkaround
+
+   * mgeom/MGeomPix.[h,cc]:
+     - because with the IgnoreTObjectStreamer set for MParContainer
+       the bits for the outer rings cannot be stored. This was no
+       problem before because in reality they have never been written
+       or read. To store the bits a new data-member fUserBits
+       has been introduced.
+     - accordingly all calles to set or remove the bits have been
+       changed to use fUserBits instead
+     - the class version number has been increased due to the new
+       data member
+     - improved Print-output
+
 
 

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

@@ -19 +19 @@
 !   Author(s): Daniela Dorner, 05/2005 <mailto:dorner@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2006
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -223 +223 @@
     Double_t max = TMath::MaxElement(g->GetN(), g->GetY());
     TString maxhum = Form("%6.1f", max);
+
+    g = (TGraph*)arr.FindObjectInCanvas("Temperature", "TGraph", "MHWeather");
+    if (!g)
+    {
+        cout << "WARNING - Reading of Temperature failed." << endl;
+        return 2;
+    }
+
+    Double_t temp = g->GetMean(2);
+    TString avgtemp = Form("%6.1f", temp);
+
+    g = (TGraph*)arr.FindObjectInCanvas("WindSpeed", "TGraph", "MHWeather");
+    if (!g)
+    {
+        cout << "WARNING - Reading of WindSpeed failed." << endl;
+        return 2;
+    }
+
+    Double_t wind = g->GetMean(2);
+    TString avgwind = Form("%6.1f", wind);
 
 
@@ -284 +304 @@
     cout << "  Rate of sparks [Hz]      " << sparkrate << endl;
     cout << "  Maximum Humidity [%]     " << maxhum    << endl;
+    cout << "  Average Temp [°C]        " << avgtemp   << endl;
+    cout << "  Average WindSpeed [km/h] " << avgwind   << endl;
     cout << "  Number of Stars          " << numstarsmed      << " +/- " << numstarsrms       << endl;
     cout << "  Number of cor. Stars     " << numcormed        << " +/- " << numcorrms         << endl;
@@ -302 +324 @@
                      " fSparkRate=%s, "
                      " fMaxHumidity=%s ,"
+                     " fAvgTemperature=%s ,"
+                     " fAvgWindSpeed=%s ,"
                      " fNumStarsMed=%s ,"
                      " fNumStarsRMS=%s ,"
@@ -313 +337 @@
                      muonrate.Data(), PSF.Data(),
                      datarate, sparkrate.Data(), maxhum.Data(),
+                     avgtemp.Data(), avgwind.Data(),
                      numstarsmed.Data(), numstarsrms.Data(),
                      numcorsmed.Data(), numcorsrms.Data(),