Changeset 7062 for trunk

Timestamp:

05/19/05 14:49:32 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/19 Daniela Dorner
+
+   * datacenter/macros/fillstar.C:
+     - add new parameter
+
+   * datacenter/macros/setupdb.C:
+     - adapted to new column in db
+
+
+
  2005/05/19 Thomas Bretz
 

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

@@ -108 +108 @@
     TString PSF = Form("%5.1f", psf);
 
+    TProfile *h2 = (TProfile*)arr.FindObjectInCanvas("SizeVsRadius", "TProfile", "MHMuonPar");
+    if (!h1)
+    {
+        cout << "WARNING - Reading of SizeVsRadius failed." << endl;
+        return 0;
+    }
+
+    Float_t integral = h2->Integral(5, 14);
+    Float_t integralmc = -35.6*psf + 11000;
+    Float_t ratiodatamc = (integral/integralmc)*100;
+    TString ratio = Form("%5.1f", ratiodatamc);
+
+
     TH1 *h = (TH1*)arr.FindObjectInCanvas("Islands", "TH1F", "MHImagePar");
     if (!h)
@@ -129 +142 @@
 
     cout << "Sequence #" << seq << endl;
-    cout << "  PSF [mm]       " << Form("%5.1f", psf)     << endl;
-    cout << "  Island Quality " << Form("%5.1f", quality) << endl;
+    cout << "  PSF [mm]       " << Form("%5.1f", psf)         << endl;
+    cout << "  Island Quality " << Form("%5.1f", quality)     << endl;
+    cout << "  Ratio [%]      " << Form("%5.1f", ratiodatamc) << endl;
 
     TString query;
@@ -138 +152 @@
                      " fSequenceFirst=%d,"
                      " fMeanNumberIslands=%s, "
+                     " fRatio=%s, "
                      " fPSF=%s ",
-                     seq, islands.Data(), PSF.Data());
+                     seq, islands.Data(), ratio.Data(), PSF.Data());
     }
     else
@@ -145 +160 @@
         query = Form("UPDATE MyMagic.Star SET"
                      " fMeanNumberIslands=%s, "
+                     " fRatio=%s, "
                      " fPSF=%s "
                      " WHERE fSequenceFirst=%d ",
-                     islands.Data(), PSF.Data(), seq);
+                     islands.Data(), ratio.Data(), PSF.Data(), seq);
     }
 

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

@@ -530 +530 @@
          "  fMeanNumberIslands  FLOAT(5,1)            NOT NULL,"
          "  fPSF                FLOAT(5,1)            NOT NULL,"
+         "  fRatio              FLOAT(5,1)            NOT NULL,"
          "  fLastUpdate         TIMESTAMP"
          ")"));