Changeset 9468 for trunk/MagicSoft

Timestamp:

06/26/09 10:47:43 (15 years ago)

Author:

hoehne

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillcamera.C (modified) (5 diffs)
• datacenter/macros/filldotrun.C (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/06/26 Daniel Hoehne-Moench
+
+   * datacenter/macros/filldotrun.C
+     - inserted Arehucas version 090616-0
+
+   * datacenter/macros/fillcamera.C:
+     - changed number of digits for thetamin, thetamax, pmin, pmax
+     - fPhiMin (pmin) and fPhiMax (pmax) are now filled into 
+       MyMagicMonteCarlo
+
+
 
  2009/06/22 Daniela Dorner

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

@@ -236 +236 @@
         imax = "NULL";
     TString numphe    = Form("%7.3f", runheader3->GetNumPheFromDNSB());
-    TString pmin      = Form("%5.1f", runheader3->GetShowerPhiMin());
-    TString pmax      = Form("%5.1f", runheader3->GetShowerPhiMax());
+    TString pmin      = Form("%5.2f", runheader3->GetShowerPhiMin());
+    TString pmax      = Form("%5.2f", runheader3->GetShowerPhiMax());
     TString numss     = Form("%7.0i", numsimshow);
-    TString thetamin  = Form("%5.1f", tmin);
-    TString thetamax  = Form("%5.1f", tmax);
+    TString thetamin  = Form("%5.2f", tmin);
+    TString thetamax  = Form("%5.2f", tmax);
     TString ped       = Form("%5.1f", fadcheader->GetPedestal(1));
     TString low2high  = Form("%5.1f", fadcheader->GetLow2HighGain());
@@ -585 +585 @@
                  "fImpactMax=%s, fNumSimulatedShowers=%d, fNumEvents=%d, "
                  "fNumPheFromDNSB=%s, fZBin=%d, fZBinMin=%d, fZBinMax=%d, fThetaMin=%s, "
-                 "fThetaMax=%s, fPointSpread=%s, "
+                 "fThetaMax=%s, fPhiMin=%s, fPhiMax=%s, fPointSpread=%s, "
                  "fPedesMean=%s, fLow2HighGain=%s, "
                  "fAmplFadcInner=%s, fAmplFadcOuter=%s, ",
@@ -591 +591 @@
                  imax.Data(), numsimshow, numevents,
                  numphe.Data(), zBin2, zBin2Min, zBin2Max, thetamin.Data(),
-                 thetamax.Data(), psf.Data(),
+                 thetamax.Data(), pmin.Data(), pmax.Data(), psf.Data(),
                  ped.Data(), low2high.Data(),
                  amplfadc.Data(), amplfadco.Data());
@@ -655 +655 @@
                      "fImpactMax=%s, fNumSimulatedShowers=%d, fNumEvents=%d, "
                      "fNumPheFromDNSB=%s, fZBin=%d, fZBinMin=%d, fZBinMax=%d, fThetaMin=%s, "
-                     "fThetaMax=%s, fPointSpread=%s, "
+                     "fThetaMax=%s, fPhiMin=%s, fPhiMax=%s, fPointSpread=%s, "
                      "fPedesMean=%s, fLow2HighGain=%s, "
                      "fAmplFadcInner=%s, fAmplFadcOuter=%s, ",
@@ -661 +661 @@
                      imax.Data(), numsimshow, numevents,
                      numphe.Data(), zBin2, zBin2Min, zBin2Max, thetamin.Data(),
-                     thetamax.Data(), psf.Data(),
+                     thetamax.Data(), pmin.Data(), pmax.Data(), psf.Data(),
                      ped.Data(), low2high.Data(),
                      amplfadc.Data(), amplfadco.Data());

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

@@ -42 +42 @@
 //   070416-0,
 //   080220-0, 080519-0, 080912-0, 081204-0, 081214-0,
-//   090203-0, 090221-0, 090522-0, 090525-0
+//   090203-0, 090221-0, 090522-0, 090525-0, 090616-0
 //
 // Usage:
@@ -134 +134 @@
         version!=200812040 && version!=200812140 &&
         version!=200902030 && version!=200902210 && version!=200905220 &&
-        version!=200905250)
+        version!=200905250 && version!=200906610)
     {
         cout << filename << ": File Version unknown - please update the macro!" << endl;