Changeset 7388

Timestamp:

11/10/05 10:05:31 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• datacenter/macros/plotdb.C (modified) (7 diffs)
• mhflux/MHEnergyEst.cc (modified) (1 diff)
• mpointing/MSrcPosCorrect.cc (modified) (4 diffs)
• mpointing/MSrcPosCorrect.h (modified) (1 diff)
• mreport/MReportTrigger.cc (modified) (1 diff)
• msql/MSQLServer.h (modified) (2 diffs)

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

@@ -59 +59 @@
 #include <TLine.h>
 #include <TText.h>
+#include <TFrame.h>
 #include <TStyle.h>
 #include <TGraph.h>
@@ -142 +143 @@
         TString title = fNameTab.IsNull() ? name(name.First('.')+2, name.Length()) : fNameTab;
         TCanvas &c = fDisplay ? fDisplay->AddTab(title) : *new TCanvas;
+        c.SetFillColor(kWhite);
+        c.SetBorderMode(0);
         c.Divide(1,2);
 
@@ -218 +221 @@
 
         g2.DrawClone("AP");
-
     }
 
@@ -293 +295 @@
     plot.SetDescription("Mean Pedestal RMS inner Camera;\\sigma_{P,I} [phe]", "PedRmsI");
     plot.Plot("Calibration.fMeanPedRmsInner",  0, 3.5, 0.05);
+    plot.SetDescription("Mean Signal inner Camera;S_{I} [phe]", "SignalI");
+    plot.Plot("Calibration.fMeanSignalInner",  0, 7.0, 0.05);
     //from star*.root
     //muon
@@ -324 +328 @@
     plot.SetDescription("Mean Pedestal RMS outer Camera;\\sigma_{P,O} [phe]", "PedRmsO");
     plot.Plot("Calibration.fMeanPedRmsOuter",  0, 4.0, 0.05);
+    plot.SetDescription("Mean Signal outer Camera;S_{O} [phe]", "SignalO");
+    plot.Plot("Calibration.fMeanSignalOuter",  0, 4.0, 0.05);
 }
 
@@ -349 +355 @@
     plot.SetRequestRange(from, to);
     plotall(plot);
+    //d->SaveAsPS("plotdb.ps");
 }
 
@@ -369 +376 @@
 
     MStatusDisplay *d = new MStatusDisplay;
-
     MPlot plot(serv);
     plot.SetDisplay(d);
     plot.SetRequestPeriod(period);
     plotall(plot);
+    //d->SaveAsPS("plotdb.ps");
 }

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc

@@ -266 +266 @@
 {
     // Project into EnergyEst_ey
-    TH1D *h1 = (TH1D*)fHEnergy.Project3D("rtlprmft_ex");
-    TH1D *h2 = (TH1D*)fHEnergy.Project3D("rtlprmft_ey");
+    TH1D *h1 = (TH1D*)fHEnergy.Project3D("rtlprmft_ex"); // E_Est
+    TH1D *h2 = (TH1D*)fHEnergy.Project3D("rtlprmft_ey"); // E_mc
 
     h2->Copy(hist);

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc

@@ -52 +52 @@
 MSrcPosCorrect::MSrcPosCorrect(const char *name, const char *title)
     : fSrcPosCam(NULL), fSrcPosAnti(NULL), fAxis(NULL), fGeom(NULL)
+     , fDx(-14.24) , fDy(-9.495)
+
 {
     fName  = name  ? name  : "MSrcPosCorrect";
@@ -105 +107 @@
     {
         *fLog << inf << "Run Number " << fRunNumber << " between 53832 and 56161." << endl;
-        *fLog << "A missfocussing correction (-0.048deg/0.034deg) will be applied." << endl;
+        *fLog << "A misfocussing correction (" << fDx << "mm/" << fDy << "mm) will be applied." << endl;
     }
 
@@ -160 +162 @@
     {
         // dx=-0.048deg, dy=0.034deg, d=0.059deg
-        static const TVector2 dxy(-14.24, -9.495);
+        static const TVector2 dxy(fDx, fDy);
 
         d -= dxy;
@@ -175 +177 @@
     return kTRUE;
 }
+
+Int_t MSrcPosCorrect::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "Dx", print))
+    {
+        fDx = GetEnvValue(env, prefix, "Dx", fDx);
+        rc = kTRUE;
+    }
+    if (IsEnvDefined(env, prefix, "Dy", print))
+    {
+        fDy = GetEnvValue(env, prefix, "Dy", fDy);
+        rc = kTRUE;
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.h

@@ -23 +23 @@
     UInt_t   fRunNumber;
 
+    Float_t fDx;
+    Float_t fDy;
+
     // MTask
     Bool_t ReInit(MParList *pList);
     Int_t  PreProcess(MParList *pList);
     Int_t  Process();
+
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public:

trunk/MagicSoft/Mars/mreport/MReportTrigger.cc

@@ -469 +469 @@
       }
 
-    n = sscanf(pos, " %f %f %n", &fL2BeforePrescaler, &fL2AfterPrescaler, &len);    if (n!=2)
+    n = sscanf(pos, " %f %f %n", &fL2BeforePrescaler, &fL2AfterPrescaler, &len);
+    if (n!=2)
       {
         *fLog << warn << "WARNING - Couldn't read Trigger rates." << endl;

trunk/MagicSoft/Mars/msql/MSQLServer.h

@@ -53 +53 @@
     }
 
-    const char *GetNameDataBase() const { return fDataBase; }
     const char *GetNameTable()    const { return Form("%s/%s",    (const char*)fDataBase, (const char*)fTable); }
     const char *GetNameColumn()   const { return Form("%s/%s/%s", (const char*)fDataBase, (const char*)fTable, (const char*)fColumn); }
@@ -93 +92 @@
 
     const char *GetName() const;
+    const char *GetNameDataBase() const { return fDataBase; }
 
     void Print(Option_t *o) const;