Changeset 7374 for trunk/MagicSoft

Timestamp:

09/30/05 10:42:20 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.rc (modified) (1 diff)
• callisto_Dec04Jan05.rc (modified) (1 diff)
• callisto_MarApr05.rc (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (2 diffs)
• mcalib/MCalibrateData.h (modified) (2 diffs)
• mjobs/MJStar.cc (modified) (4 diffs)
• mmuon/MHMuonPar.cc (modified) (1 diff)
• mpointing/MPointingDevCalc.cc (modified) (1 diff)
• resources (added)
• resources/calibration.rc (added)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
    * mpointing/MPointingDevCalc.cc:
      - reset counter in PreProcess
+
+   * resources/calibration.rc:
+     - new file
 
 

trunk/MagicSoft/Mars/NEWS

@@ -13 +13 @@
 
    - merpp: made aware of new format 20050829-0
+
+   - callisto: New scale factors from muon analysis, stored in new 
+     resource file resources/calibration.rc
 
    - callisto: MBadPixelsCalc now raises an error instead of simply stopping

trunk/MagicSoft/Mars/callisto.rc

@@ -399 +399 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.9633911368
+#MJCalibrateSignal.MCalibrateData.ScaleFactor: 1
+MJCalibrateSignal.MCalibrateData.FileNameScale: resources/calibration.rc
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01

trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

@@ -410 +410 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.919117647
+MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.85182358
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01

trunk/MagicSoft/Mars/callisto_MarApr05.rc

@@ -399 +399 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 1.01419878296146
+#MJCalibrateSignal.MCalibrateData.ScaleFactor: 1
+MJCalibrateSignal.MCalibrateData.FileNameScale: resources/calibration.rc
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01

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

@@ -114 +114 @@
 
     Float_t mw    = hmuon->GetMeanWidth();
-    Float_t psf   = -194.031674+404.077598*mw-192.532597*mw*mw;
+    Float_t psf   = 51.505292 - 31.147126*mw;
     psf = TMath::Nint(psf*10)/10.;
     TString PSF = Form("%5.1f", psf);

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -429 +429 @@
     // output information or warnings:
     //
-    switch(fSignalType)
+    switch (fSignalType)
     {
     case kPhe:
-      *fLog << inf << "Calibrating in units of equivalent (outer/inner=4) photo-electrons." << endl;
-      break;
+        *fLog << inf << "Calibrating in units of equivalent (outer/inner=4) photo-electrons." << endl;
+        break;
     case kPhot:
-      *fLog << inf << "Calibrating in units of photons." << endl;
-      break;
+        *fLog << inf << "Calibrating in units of photons." << endl;
+        break;
     }
 
     if (header->IsMonteCarloRun())
     {
-        *fLog << "Additional scale factor: 1 (MonteCarloRun)" << endl;
+        *fLog << inf << "Additional scale factor forced to: 1 (MonteCarloRun)" << endl;
         fScaleFactor = 1;
     }
     else
-        *fLog << "Additional scale factor: " << fScaleFactor << endl;
+    {
+        if (!fFileNameScale.IsNull())
+        {
+            if (gSystem->AccessPathName(fFileNameScale, kFileExists))
+            {
+                *fLog << err << "ERROR - Configuration file '" << fFileNameScale << "' doesn't exist... abort." << endl;
+                return kFALSE;
+            }
+
+            const Int_t   p   = header->GetRunStart().GetMagicPeriod();
+            const TString per = Form("%2d", p);
+
+            TEnv rc(fFileNameScale);
+            const Double_t scale = rc.GetValue(per, -1.);
+
+            if (scale<=0)
+            {
+                *fLog << err << "ERROR - No valid entry for scale factor found for period " << p << " in " << fFileNameScale << "... abort." << endl;
+                return kFALSE;
+            }
+
+            *fLog << inf << "New additional scale factor for period " << p << ": " << scale << endl;
+            fScaleFactor = scale;
+        }
+        else
+            *fLog << inf << "Additional scale factor set to: " << fScaleFactor << endl;
+    }
 
     const Int_t npixels = fGeomCam->GetNumPixels();
@@ -931 +957 @@
     }
 
+    if (IsEnvDefined(env, prefix, "FileNameScale", print))
+    {
+        fFileNameScale = GetEnvValue(env, prefix, "FileNameScale", fFileNameScale);
+        rc = kTRUE;
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -79 +79 @@
   Float_t  fRenormFactor;                // Possible renormalization factor for signals (-> phes)
   Float_t  fScaleFactor;                 // Possible scale factor for signals
-  
+
+  TString  fFileNameScale;               // File name for list of scale factors
+
   TList   fNamesPedestal;                // Names of input and output pedestal conatainer
   TList   fPedestalCams;                 //! List of pointers to input MPedestalCam
@@ -106 +108 @@
   void   EnablePedestalType(PedestalType_t i)     { fPedestalFlag |=  i;      }
 
-  Int_t  GetSize() const { return fCalibConsts.GetSize(); }
+  //Int_t  GetSize() const { return fCalibConsts.GetSize(); }
 
   void   Print(Option_t *o="") const;

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -399 +399 @@
     histdc.SetTitle("Mean of all DC Currents;;<I> [nA]");
     histdc.SetMinimum(0);
-    histdc.SetMaximum(3);
+    histdc.SetMaximum(10);
     histrms.SetNameTime("MTimeCurrents");
     histrms.SetTitle("Mean pedestal rms of all pixels;;<\\sigma_{p}> [phe]");
+    histrms.SetType(5);
     histrms.SetMinimum(0);
-    histrms.SetMaximum(0.2);
+    histrms.SetMaximum(10);
 
     /*
@@ -413 +414 @@
     MFillH filldc(&histdc,   "MCameraDC",                 "FillDC");
     MFillH fillrms(&histrms, "MPedPhotFromExtractorRndm", "FillPedRms");
+    //MFillH filltst("MHTest", "MTime", "FillTest");
     filldc.SetNameTab("Currents");
     fillrms.SetNameTab("MeanRms");
+    //filltst.SetNameTab("Test");
 
     MFillH fillw("MHWeather", "MTimeCC", "FillWeather");
@@ -424 +427 @@
     tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
     tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
+    //tlist.AddToList(&filltst, "Events");
     tlist.AddToList(&tlist2, "Events");
     if (!ismc)
@@ -432 +436 @@
         tlist.AddToList(&filldc,  "Currents");
         tlist.AddToList(&fillrms, "Currents");
-    }
+   }
     tlist.AddToList(&write);
 

trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc

@@ -214 +214 @@
     txt.SetTextColor(kBlue);
 
-    TF1 ref("RefShape100%", "-254+1640*x-565*x*x", fgIntegralLoLim, fgIntegralUpLim);
+    TF1 ref("RefShape100%", "-131+1333*x-385*x*x", fgIntegralLoLim, fgIntegralUpLim);
     // old: 573*x + 430
     ref.SetLineColor(kBlue);

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -128 +128 @@
     fRunType  = MRawRunHeader::kRTNone;
 
+    fSkip.Reset();
+
     return fDeviation ? kTRUE : kFALSE;
 }