Changeset 8477

Timestamp:

05/08/07 14:34:24 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/magicdefs.php (modified) (3 diffs)
• datacenter/db/menu.php (modified) (2 diffs)
• datacenter/db/querycal.php (modified) (2 diffs)
• datacenter/macros/fillsignal.C (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/05/08 Daniel Hoehne
+
+   * datacenter/macros/fillsignal.C:
+     - implemented new variables fUnsuitable50 and fUnsuitable01
+
+   * datacenter/db/menu.php, magicdefs.php, querycal.php:
+     - implemented new columns fUnsuitable50 and fUnsuitable01
+
+
+
  2007/05/04 Thomas Bretz
 

trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

@@ -218 +218 @@
      "fUnreliableInner"                 => "Un<br>rel.<br>In",
      "fUnsuitableInner"                 => "Un<br>suit.<br>In",
+     "fUnsuitable50"                    => "Un<br>suit.<br>50",
+     "fUnsuitable01"                    => "Un<br>suit.<br>01",
      "fIsolatedOuter"                   => "Isol.<br>Out",
      "fIsolatedInner"                   => "Isol.<br>In",
@@ -363 +365 @@
      $alias["fUnsuitableInner"]          => "1",
      $alias["fUnreliableInner"]          => "1",
+     $alias["fUnsuitable50"]             => "1",
+     $alias["fUnsuitable01"]             => "1",
      $alias["fIsolatedOuter"]            => "1",
      $alias["fIsolatedInner"]            => "1",
@@ -519 +523 @@
          "fUnsuitableInner"                  => "Calibration.fUnsuitableInner",
          "fUnsuitableOuter"                  => "Calibration.fUnsuitableOuter",
+         "fUnsuitable50"                     => "Calibration.fUnsuitable50",
+         "fUnsuitable01"                     => "Calibration.fUnsuitable01",
          "fUnreliableInner"                  => "Calibration.fUnreliableInner",
          "fUnreliableOuter"                  => "Calibration.fUnreliableOuter",

trunk/MagicSoft/Mars/datacenter/db/menu.php

@@ -280 +280 @@
     printf("  </tr><tr>\n");
 
+    CheckBox("fUnsuitable50",        "Unsuitable (50%)");
+    CheckBox("fUnsuitable01",        "Unsuitable (1%)");
+
+    printf("  </tr><tr>\n");
+
     CheckBox("fIsolatedInner",       "Isolated inner");
     CheckBox("fIsolatedOuter",       "Isolated outer");
@@ -829 +834 @@
         $_GET["fUnsuitableInner"]="Off";
 
+    if (empty($_GET["fUnsuitable50"]))
+        $_GET["fUnsuitable50"]="Off";
+
+    if (empty($_GET["fUnsuitable01"]))
+        $_GET["fUnsuitable01"]="Off";
+
     if (empty($_GET["fIsolatedInner"]))
         $_GET["fIsolatedInner"]="Off";

trunk/MagicSoft/Mars/datacenter/db/querycal.php

@@ -52 +52 @@
             $_GET["fUnsuitableOuter"]=$first?"On":"";
 
+        if (empty($_GET["fUnsuitable50"]))
+            $_GET["fUnsuitable50"]=$first?"On":"";
+
+        if (empty($_GET["fUnsuitable01"]))
+            $_GET["fUnsuitable01"]=$first?"On":"";
+
         if (empty($_GET["fUnreliableOuter"]))
             $_GET["fUnreliableOuter"]=$first?"On":"";
@@ -113 +119 @@
         CheckBox("fUnreliableInner",     "Unreliable inner");
         CheckBox("fUnreliableOuter",     "Unreliable outer");
+
+        printf("  </tr><tr>\n");
+
+        CheckBox("fUnsuitable50",        "Unsuitable (50%)");
+        CheckBox("fUnsuitable01",        "Unsuitable (1%)");
         CheckBox("fIsolatedInner",       "Isolated inner");
         CheckBox("fIsolatedOuter",       "Isolated outer");

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

@@ -57 +57 @@
 /////////////////////////////////////////////////////////////////////////////
 #include <iostream>
+#include <iomanip>
 
 #include <TEnv.h>
@@ -73 +74 @@
 
 using namespace std;
+
+Int_t CalcUnsuitable(const MHCamera &cam, Float_t f)
+{
+    Int_t n = 0;
+    for (int i=0; i<cam.GetNbinsX(); i++)
+        if (cam.GetBinContent(i+1)>f)
+            n++;
+
+    return n;
+}
 
 int Process(MSQLServer &serv, TString fname, Bool_t dummy)
@@ -238 +249 @@
     meanpul = TMath::Nint(meanpul*100)/100.;
     rmspul  = TMath::Nint(rmspul *100)/100.;
+
+    cam = (MHCamera*)arr.FindObjectInCanvas("Unsuitable;avg", "MHCamera", "Unsuitable");
+    if (!cam)
+    {
+        cout << "WARNING - Reading of Unsuitable;avg failed." << endl;
+        return 2;
+    }
+
+    Int_t unsuitable50 = CalcUnsuitable(*cam, 0.50);
+    Int_t unsuitable01 = CalcUnsuitable(*cam, 0.01);
 
 /*
@@ -293 +314 @@
     cout << "  Lo-Hi gain offset:      " << medpuloff    << " +-  " << devpuloff    << endl;
     cout << "  Hi/Lo gain ratio:        " << medhilocal   << " +- " << devhilocal   << endl;
+    cout << "  Unsuitable > 50%:       " << setw(6) << unsuitable50 << endl;
+    cout << "  Unsuitable >  1%:       " << setw(6) << unsuitable01 << endl;
     cout << endl;
 
@@ -307 +330 @@
                          //" fPulsePosLoMean=%s,    fPulsePosLoRms=%s,    "
                          " fPulsePosOffMed=%s,    fPulsePosOffDev=%s,   "
-                         " fHiLoGainRatioMed=%s,  fHiLoGainRatioDev=%s  "
+                         " fHiLoGainRatioMed=%s,  fHiLoGainRatioDev=%s,  "
+                         " fUnsuitable50=%d,  fUnsuitable01=%d  "
                          " WHERE fSequenceFirst='%d' ",
                          meanrmsinner.Data(),  meanrmsouter.Data(),
@@ -317 +341 @@
                          medpuloff.Data(),    devpuloff.Data(),
                          medhilocal.Data(),   devhilocal.Data(),
+                         unsuitable50, unsuitable01,
                          seq);