Changeset 7359 for trunk/MagicSoft/Mars

Timestamp:

09/21/05 16:55:22 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• datacenter/macros/fillsignal.C (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
      - changed some resolution values
 
+   * datacenter/macros/fillsignal.C:
+     - started support to fill mean interpolated signal into DB
+
    * mfileio/MWriteRootFile.cc:
      - added a FIXME comment
@@ -44 +47 @@
 
    * mjobs/MJob.[h,cc]:
-     - new ststic functions: SortArray
+     - new static functions: SortArray
 
    * mjobs/MSequence.cc:

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

@@ -98 +98 @@
     Int_t s0[] = { 1, 2, 3, 4, 5, 6 };
 
-    Stat_t meani = cam->GetMeanSectors(TArrayI(6, s0), inner);
-    Stat_t meano = cam->GetMeanSectors(TArrayI(6, s0), outer);
+    Stat_t meanrmsi = cam->GetMeanSectors(TArrayI(6, s0), inner);
+    Stat_t meanrmso = cam->GetMeanSectors(TArrayI(6, s0), outer);
 
-    if (meani<0 || meano<0)
+    if (meanrmsi<0 || meanrmso<0)
     {
         cout << "WARNING - MeanPedRMS inner or outer < 0 " << endl;
-        cout << "MeanPedRMS inner " << meani << endl;
-        cout << "MeanPedRMS outer " << meano << endl;
+        cout << "MeanPedRMS inner " << meanrmsi << endl;
+        cout << "MeanPedRMS outer " << meanrmso << endl;
         return 0;
     }
 
-    meani = TMath::Nint(meani*100)/100.;
-    meano = TMath::Nint(meano*100)/100.;
+    meanrmsi = TMath::Nint(meanrmsi*100)/100.;
+    meanrmso = TMath::Nint(meanrmso*100)/100.;
+
+    cam = (MHCamera*)arr->FindObjectInCanvas("Interp'd;avg", "MHCamera", "Interp'd");
+    if (!cam)
+    {
+        cout << "WARNING - Reading of Interp'd;avg failed." << endl;
+        return 0;
+    }
+
+    Stat_t meansigi = cam->GetMeanSectors(TArrayI(6, s0), inner);
+    Stat_t meansigo = cam->GetMeanSectors(TArrayI(6, s0), outer);
+
+    if (meansigi<0 || meansigo<0)
+    {
+        cout << "WARNING - MeanInterp'd inner or outer < 0 " << endl;
+        cout << "MeanInterp'd inner " << meansigi << endl;
+        cout << "MeanInterp'd outer " << meansigo << endl;
+        return 0;
+    }
+
+    meansigi = TMath::Nint(meansigi*100)/100.;
+    meansigo = TMath::Nint(meansigo*100)/100.;
 
     TString sequence = fname(TRegexp("signal[0-9]+[.]root$"));
@@ -121 +142 @@
 
     Int_t seq = atoi(sequence.Data()+6);
-    TString meaninner=Form("%6.2f", meani);
-    TString meanouter=Form("%6.2f", meano);
+    TString meanrmsinner=Form("%6.2f", meanrmsi);
+    TString meanrmsouter=Form("%6.2f", meanrmso);
+    TString meansiginner=Form("%6.2f", meansigi);
+    TString meansigouter=Form("%6.2f", meansigo);
 
     cout << "Sequence #" << seq << endl;
-    cout << "  Mean Ped RMS inner [phe] " << meaninner << endl;
-    cout << "  Mean Ped RMS outer [phe] " << meanouter << endl;
+    cout << "  Mean Ped RMS inner [phe] " << meanrmsinner << endl;
+    cout << "  Mean Ped RMS outer [phe] " << meanrmsouter << endl;
+    cout << "  Mean Signal  inner [phe] " << meansiginner << endl;
+    cout << "  Mean Signal  outer [phe] " << meansigouter << endl;
 
+    // Missing....    meansiginner, meansigouter
     TString query = Form("UPDATE Calibration SET fMeanPedRmsInner=%s, "
                          " fMeanPedRmsOuter=%s WHERE fSequenceFirst='%d' ",
-                         meaninner.Data(), meanouter.Data(), seq);
+                         meanrmsinner.Data(), meanrmsouter.Data(), seq);
 
     if (dummy)