Changeset 7085 for trunk

Timestamp:

05/23/05 11:55:11 (20 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillcalib.C (modified) (4 diffs)
• datacenter/macros/setupdb.C (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
    * datacenter/macros/fillstar.C, fillcalib.C, fillsignal.C:
      - added check
+
+   * datacenter/macros/fillcalib.C, setupdb.C:
+     - adapted variables for the conversion factor
 
 

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

@@ -171 +171 @@
     meani = TMath::Nint(meani*10)/10.;
     rmsi  = TMath::Nint(rmsi*10)/10.;
-    TString meaninner = Form("%4.1f", meani);
-    TString rmsinner  = Form("%4.1f", rmsi);
+    TString meaninner = Form("%5.1f", meani);
+    TString rmsinner  = Form("%5.1f", rmsi);
 
 
@@ -187 +187 @@
     meano = TMath::Nint(meano*10)/10.;
     rmso  = TMath::Nint(rmso*10)/10.;
-    TString meanouter = Form("%4.1f", meano);
-    TString rmsouter  = Form("%4.1f", rmso);
+    TString meanouter = Form("%5.1f", meano);
+    TString rmsouter  = Form("%5.1f", rmso);
 
 
@@ -209 +209 @@
     meanconvi = TMath::Nint(meanconvi*10)/10.;
     meanconvo = TMath::Nint(meanconvo*10)/10.;
-    TString meanconvinner=Form("%4.1f", meanconvi);
-    TString meanconvouter=Form("%4.1f", meanconvo);
+    TString meanconvinner=Form("%6.2f", meanconvi);
+    TString meanconvouter=Form("%6.2f", meanconvo);
 
 
@@ -229 +229 @@
     cout << "  Isolated:   (i/o) " << Form("%3d %3d", (int)isoin, (int)isoout) << endl; // Isolated (unbrauchbar)
     cout << "  Max.Cluster:      " << Form("%3d", (int)clumax)                 << endl; // Max Cluster
-    cout << "  Arr Time inner:    " << Form("%4.1f +- %4.1f", meani, rmsi)      << endl;
-    cout << "  Arr Time outer:    " << Form("%4.1f +- %4.1f", meano, rmso)      << endl;
-    cout << "  Mean Conv inner:   " << Form("%4.1f", meanconvi)                 << endl;
-    cout << "  Mean Conv outer:   " << Form("%4.1f", meanconvo)                 << endl;
+    cout << "  Arr Time inner:    " << Form("%5.1f +- %5.1f", meani, rmsi)      << endl;
+    cout << "  Arr Time outer:    " << Form("%5.1f +- %5.1f", meano, rmso)      << endl;
+    cout << "  Mean Conv inner:   " << Form("%6.2f", meanconvi)                 << endl;
+    cout << "  Mean Conv outer:   " << Form("%6.2f", meanconvo)                 << endl;
 
     TString query;

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

@@ -520 +520 @@
          "  fArrTimeMeanOuter   FLOAT(5,1)            NOT NULL,"
          "  fArrTimeRmsOuter    FLOAT(5,1)            NOT NULL,"
-         "  fConvFactorInner    FLOAT(5,1)            NOT NULL,"
-         "  fConvFactorOuter    FLOAT(5,1)            NOT NULL,"
+         "  fConvFactorInner    FLOAT(6,2)            NOT NULL,"
+         "  fConvFactorOuter    FLOAT(6,2)            NOT NULL,"
          "  fLastUpdate         TIMESTAMP"
          ")"));