Changeset 7777 for trunk/MagicSoft/Mars

Timestamp:

07/05/06 11:41:13 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/checkfileavail.C (modified) (2 diffs)
• datacenter/macros/checkstardone.C (modified) (2 diffs)
• datacenter/macros/doexclusions.C (modified) (6 diffs)
• datacenter/macros/filldotraw.C (modified) (2 diffs)
• datacenter/macros/fillganymed.C (modified) (1 diff)
• datacenter/macros/fillsignal.C (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (1 diff)
• datacenter/macros/setupdb.C (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (3 diffs)
• mhflux/MAlphaFitter.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/07/05 Thomas Bretz
+
+   * datacenter/macros/checkfileavail.C,
+     datacenter/macros/checkstardone.C, 
+     datacenter/macros/doexclusions.C, 
+     datacenter/macros/filldotraw.C,
+     datacenter/macros/fillganymed.C,
+     datacenter/macros/fillsignal.C,
+     datacenter/macros/fillstar.C,
+     datacenter/macros/setupdb.C:
+     - make sure that 'res' is correctly deleted
+     
+   * datacenter/macros/doexclusions.C:
+     - fixed some variable name overrides
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added the possibility to DrawResult()
+
+
 
  2006/07/04 Daniela Dorner

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

@@ -77 +77 @@
     }
 
-    TSQLRow *row=0;
-    while ((row = res->Next()))
-    {
-//        TString entry=(*row)[0];
-//        if (entry=="1970-01-01 00:00:00")
-//            return "";
-        return (*row)[0];
-    }
+    TString rc = (*row)[0];
 
-    return "";
+    delete res;
+
+    return rc;
 }
 
@@ -138 +133 @@
         cout << "run#: " << runno << endl;
         //if one value returns "" (i.e. column is NULL), 0 is returned
-        if (GetStatus(serv, rc, runno, "RunProcessStatus", "fCCFileAvail")==""
-            || GetStatus(serv, rc, runno, "RunProcessStatus", "fCaCoFileAvail")==""
-            || GetStatus(serv, rc, runno, "RunProcessStatus", "fCaCoFileFound")==""
-            || GetStatus(serv, rc, runno, "RunProcessStatus", "fTimingCorrection")==""
+        if (GetStatus(serv, rc, runno, "RunProcessStatus", "fCCFileAvail").IsNull()
+            || GetStatus(serv, rc, runno, "RunProcessStatus", "fCaCoFileAvail").IsNull()
+            || GetStatus(serv, rc, runno, "RunProcessStatus", "fCaCoFileFound").IsNull()
+            || GetStatus(serv, rc, runno, "RunProcessStatus", "fTimingCorrection").IsNull()
 //            || GetStatus(serv, rc, runno, "RunProcessStatus", "fTimingCorrection")=="1970-01-01 00:00:00"
-            || GetStatus(serv, rc, runno, "RunProcessStatus", "fRawFileAvail")=="")
+            || GetStatus(serv, rc, runno, "RunProcessStatus", "fRawFileAvail").IsNull())
             return 2;
     }

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

@@ -74 +74 @@
     }
 
-    TSQLRow *row=0;
-    while ((row = res->Next()))
-        return (*row)[0];
+    TString rc = (*row)[0];
 
-    return "";
+    delete res;
+
+    return rc;
 }
 
@@ -100 +100 @@
 
     //check if fStar not NULL for sequence 
-    if (GetStatus(serv, rc, datasetno, "SequenceProcessStatus", "fStar")=="")
+    if (GetStatus(serv, rc, datasetno, "SequenceProcessStatus", "fStar").IsNull())
         return 2;
 

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

@@ -174 +174 @@
         //get importance of exclusion-reason from database
         TString query(Form("SELECT fExcludedFDAImportance from ExcludedFDA where fExcludedFDAKEY=%s ", key.Data()));
-        TSQLResult *res = serv.Query(query);
-        if (!res)
+        TSQLResult *res2 = serv.Query(query);
+        if (!res2)
         {
             cout << "Error - could not get importance." << endl;
@@ -181 +181 @@
         }
 
-        TSQLRow *row2=res->Next();
+        TSQLRow *row2=res2->Next();
         Int_t newimp=atoi((*row2)[0]);
-        delete res;
+        delete res2;
 
         //get current importance from database
@@ -210 +210 @@
         cout << query << endl;
 
-        res = serv.Query(query);
-        if (!res)
+        res2 = serv.Query(query);
+        if (!res2)
         {
             cout << "Error - no runs to exclude" << endl;
@@ -219 +219 @@
         //compare new and old importance
         //change or keep the exclusion-reason accordingly
-        while ((row2 = res->Next()))
+        while ((row2 = res2->Next()))
         {
             if (TString((*row2)[1]).IsNull() || atoi((*row2)[1])>newimp)
@@ -227 +227 @@
                                    key.Data(), (*row2)[0]));
                 cout << "QU: " << query << endl;
-                TSQLResult *res = serv.Query(query);
-                if (!res)
+                TSQLResult *res3 = serv.Query(query);
+                if (!res3)
                 {
                     cout << "Error - could not insert exclusion" << endl;
                     return 2;
                 }
-                delete res;
+                delete res3;
                 continue;
             }
@@ -239 +239 @@
             cout << "run#: " << (*row2)[0] << " reason for exclusion is still the same" << endl;
         }
-        delete res;
+        delete res2;
     }
     delete res;

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

@@ -94 +94 @@
     }
 
-    return atoi((*row)[0]);
+    Int_t rc = atoi((*row)[0]);
+
+    delete res;
+
+    return rc;
 }
 
@@ -168 +172 @@
         return 2;
     }
-
+    delete res;
     return 1;
 }

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

@@ -212 +212 @@
         return 2;
     }
+    delete res;
     return 1;
 }

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

@@ -235 +235 @@
         return 2;
     }
-
+    delete res;
     return 1;
 }

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

@@ -337 +337 @@
         return 2;
     }
+    delete res;
 
     return 1;

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

@@ -140 +140 @@
             fields += ", ";
     }
+
+    delete res;
 
     return fields;

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -330 +330 @@
     // Assuming that bg and fit2.GetEventsBackground() are rather identical:
     const Double_t sc = er*er / fit.GetEventsBackground();
-    /*
+
      cout << MMath::SignificanceLiMaSigned(hon.Integral(1, bin), fit.GetEventsBackground()/sc, sc) << " ";
      cout << sc << " ";
      cout << fit.fChiSqBg << endl;
-     */
+
     return sc;
 }
@@ -404 +404 @@
 }
 
-void MAlphaFitter::PaintResult(Float_t x, Float_t y, Float_t size) const
+void MAlphaFitter::PaintResult(Float_t x, Float_t y, Float_t size, Bool_t draw) const
 {
     const Double_t w  = GetGausSigma();
@@ -413 +413 @@
     const TString fmt = Form("\\sigma_{L/M}=%%.1f  \\omega=%%.%df\\circ  E=%%d B=%%d  x<%%.%df  \\tilde\\chi_{b}=%%.1f  \\tilde\\chi_{s}=%%.1f  c=%%.1f  f=%%.2f",
                              l1<1?1:l1+1, l2<1?1:l2+1);
-
-    TLatex text(x, y, Form(fmt.Data(), fSignificance, w, (int)fEventsExcess,
-                           (int)fEventsBackground, m, fChiSqBg, fChiSqSignal,
-                           fCoefficients[3], fScaleFactor));
-
+    const TString txt = Form(fmt.Data(), fSignificance, w, (int)fEventsExcess,
+                             (int)fEventsBackground, m, fChiSqBg, fChiSqSignal,
+                             fCoefficients[3], fScaleFactor);
+
+    // This is totaly weired but the only way to get both options
+    // working with this nonsense implementation of TLatex
+    TLatex text(x, y, txt);
     text.SetBit(TLatex::kTextNDC);
     text.SetTextSize(size);
-    text.Paint();
+    if (draw)
+        text.DrawLatex(x, y, txt);
+    else
+        text.Paint();
 
     TLine line;
     line.SetLineColor(14);
-    line.PaintLine(m, gPad->GetUymin(), m, gPad->GetUymax());
+    if (draw)
+        line.DrawLine(m, gPad->GetUymin(), m, gPad->GetUymax());
+    else
+        line.PaintLine(m, gPad->GetUymin(), m, gPad->GetUymax());
 }
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -237 +237 @@
 
     // Interface to result
-    void PaintResult(Float_t x=0.04, Float_t y=0.94, Float_t size=0.035) const;
+    void PaintResult(Float_t x=0.04, Float_t y=0.94, Float_t size=0.035, Bool_t draw=kFALSE) const;
+    void DrawResult(Float_t x=0.04, Float_t y=0.94, Float_t size=0.035) const { PaintResult(x, y, size, kTRUE); }
 
     // MTask