Changeset 7394 for trunk

Timestamp:

11/11/05 16:33:22 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/filldotrun.C (modified) (3 diffs)
• datacenter/macros/fillsignal.C (modified) (4 diffs)
• datacenter/macros/setupdb.C (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
    * datacenter/scripts/rmlocks:
      - fixed condition for removing lock-file
+
+   * datacenter/macros/filldotrun.C:
+     - added new arehucas version
+
+   * datacenter/macros/fillsignal.C,setupdb.C:
+     - added new variable (fPulsePosMean, fPulsePosRms)
 
 

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

@@ -38 +38 @@
 //   041113-0, 041209-0, 041221-0
 //   050224-0, 050317-0, 050322-0, 050401-0, 050413-0, 050415-0, 050714-0,
-//     050719-0, 050829-0
+//     050719-0, 050829-0, 051025-0
 //
 // Usage:
@@ -182 +182 @@
         version!=200502240 && version!=200503170 && version!=200503220 &&
         version!=200504010 && version!=200504130 && version!=200504150 &&
-        version!=200507140 && version!=200507190 && version!=200508290)
+        version!=200507140 && version!=200507190 && version!=200508290 &&
+        version!=200510250)
     {
         cout << filename << ": File Version unknown - please update the macro!" << endl;
@@ -450 +451 @@
             || version==200502240 || version==200503170 || version==200503220
             || version==200504010 || version==200504130 || version==200504150
-            || version==200507140 || version==200507190 || version==200508290)
+            || version==200507140 || version==200507190 || version==200508290
+            || version==200510250)
         {
             // ========== Col 19-35: DC and HV-values, mjd =========

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

@@ -90 +90 @@
     }
 
+    MHCamera *pul = (MHCamera*)arr->FindObjectInCanvas("PulsePos;avg", "MHCamera", "PulsePos");
+    if (!pul)
+    {
+        cout << "WARNING - Reading of PulsePos;avg failed." << endl;
+        return 0;
+    }
+
     TArrayI inner(1);
     inner[0] = 0;
@@ -132 +139 @@
     meansigi = TMath::Nint(meansigi*100)/100.;
     meansigo = TMath::Nint(meansigo*100)/100.;
+
+    Stat_t meanpul = pul->GetMean();
+    Stat_t rmspul  = pul->GetRMS();
+
+    if (meanpul<0 || rmspul<0)
+    {
+        cout << "WARNING - PulsePos'd mean or rms < 0 " << endl;
+        cout << "PulsePos'd mean " << meanpul << endl;
+        cout << "PulsePos'd rms  " << rmspul << endl;
+        return 0;
+    }
+
+    meanpul = TMath::Nint(meanpul*100)/100.;
+    rmspul  = TMath::Nint(rmspul*100)/100.;
 
     TString sequence = fname(TRegexp("signal[0-9]+[.]root$"));
@@ -146 +167 @@
     TString meansiginner=Form("%6.2f", meansigi);
     TString meansigouter=Form("%6.2f", meansigo);
+    TString meanpulpos  =Form("%6.2f", meanpul);
+    TString rmspulpos   =Form("%6.2f", rmspul);
 
     cout << "Sequence #" << seq << endl;
@@ -152 +175 @@
     cout << "  Mean Signal  inner [phe] " << meansiginner << endl;
     cout << "  Mean Signal  outer [phe] " << meansigouter << endl;
+    cout << "  Mean PulsePos            " << meanpulpos   << endl;
+    cout << "  Rms  PulsePos            " << rmspulpos    << endl;
 
     TString query = Form("UPDATE Calibration SET "
                          " fMeanPedRmsInner=%s, fMeanPedRmsOuter=%s, "
-                         " fMeanSignalInner=%s, fMeanSignalOuter=%s  "
+                         " fMeanSignalInner=%s, fMeanSignalOuter=%s, "
+                         " fPulsePosMean=%s,    fPulsePosRms=%s      "
                          " WHERE fSequenceFirst='%d' ",
                          meanrmsinner.Data(), meanrmsouter.Data(),
                          meansiginner.Data(), meansigouter.Data(),
+                         meanpulpos.Data(),   rmspulpos.Data(),
                          seq);
 

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

@@ -549 +549 @@
          "  fConvFactorInner    FLOAT(6,3)            NOT NULL,"
          "  fConvFactorOuter    FLOAT(6,3)            NOT NULL,"
+         "  fPulsePosMean       FLOAT(6,2)            NOT NULL,"
+         "  fPulsePosRms        FLOAT(6,2)            NOT NULL,"
          "  fLastUpdate         TIMESTAMP"
          ")"));