Changeset 5460 for trunk/MagicSoft/Mars

Timestamp:

11/23/04 10:00:51 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (2 diffs)
• mhcalib/MHGausEvents.h (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
      - stores the histogram RMS in MCalibrationPix in function 
        FitHiGainHists and FitLoGainHists
+
+   * mjobs/MJCalibration.cc
+     - display in the datacheck the RMS per Mean instead of the reduced
+       sigma per mean which is anyhow reflected by the number of photo-
+       electrons.
 
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1193 +1193 @@
   pix.SetHiGainMean       ( hist.GetMean()      );
   pix.SetHiGainMeanVar    ( hist.GetMeanErr() * hist.GetMeanErr()   );
+  pix.SetHiGainRms        ( hist.GetHistRms()   );
   pix.SetHiGainSigma      ( hist.GetSigma()     );
   pix.SetHiGainSigmaVar   ( hist.GetSigmaErr()* hist.GetSigmaErr()  );
@@ -1275 +1276 @@
   pix.SetLoGainMean       ( hist.GetMean()      );
   pix.SetLoGainMeanVar    ( hist.GetMeanErr()  * hist.GetMeanErr()   );
+  pix.SetLoGainRms        ( hist.GetHistRms()   );
   pix.SetLoGainSigma      ( hist.GetSigma()     );
   pix.SetLoGainSigmaVar   ( hist.GetSigmaErr() * hist.GetSigmaErr()  );

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

@@ -122 +122 @@
         TH1I    *GetHPowerProbability()        { return fHPowerProbability;  }
   const TH1I    *GetHPowerProbability()  const { return fHPowerProbability;  } 
+  const Double_t GetHistRms()            const { return fHGausHist.GetRMS(); }
   const Double_t GetMean()               const { return fMean;               }
   const Double_t GetMeanErr()            const { return fMeanErr;            }

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -132 +132 @@
 #include "MCalibrationChargeCalc.h"
 #include "MCalibColorSet.h"
+#include "MCalibrationRelTimeCam.h"
+#include "MCalibrationRelTimeCalc.h"
 
 #include "MHGausEvents.h"
@@ -139 +141 @@
 #include "MHCalibrationChargePINDiode.h"
 #include "MHCalibrationRelTimeCam.h"
-#include "MCalibrationRelTimeCam.h"
-#include "MCalibrationRelTimeCalc.h"
 
 #include "MReadMarsFile.h"
+#include "MPedCalcPedRun.h"
 #include "MRawFileRead.h"
 #include "MGeomApply.h"
@@ -341 +342 @@
     MHCamera disp34(geomcam, "TimeOscillating",   "Oscillating Pixels");
     MHCamera disp35(geomcam, "TotalConv",         "Conversion Factor to photons");
+    MHCamera disp36(geomcam, "RMSperMean",        "Charge histogram RMS per Mean");
     
     MCalibrationChargeCam  *cam    = NULL;
@@ -425 +427 @@
     disp29.SetCamContent(*cam, 27);
 
+    // RMS and Mean
+    disp36.SetCamContent(*cam,32);
+
     disp1.SetYTitle("Q [FADC counts]");
     disp2.SetYTitle("\\sigma_{Q} [FADC counts]");
@@ -463 +468 @@
 
     disp35.SetYTitle("Conv.Factor [Ph/FADC counts]");
+
+    disp36.SetYTitle("Charge RMS/<Q> [1]");
 
     for (UInt_t i=0;i<geomcam.GetNumPixels();i++)
@@ -569 +576 @@
       
       //
-      // REDUCED SIGMAS
+      // RMS per Charge
       // 
       
@@ -575 +582 @@
       gPad->SetBorderMode(0);
       gPad->SetTicks();
-      MHCamera *obj3=(MHCamera*)disp4.DrawCopy("hist");
+      MHCamera *obj3=(MHCamera*)disp36.DrawCopy("hist");
       //
       // for the datacheck, fix the ranges!!
       //
-      obj3->SetMinimum(0.);
+      //      obj3->SetMinimum(0.);
       // obj3->SetMaximum(fgChargeMax);
       //
@@ -599 +606 @@
       gPad->SetBorderMode(0);
       if (geomcam.InheritsFrom("MGeomCamMagic"))
-        DisplayDoubleProject(&disp4, "dead", "noisy");
+        DisplayDoubleProject(&disp36, "dead", "noisy");
       
       //
@@ -1558 +1565 @@
     plist.AddToList(&pedcam);
     plist.AddToList(&fBadPixels);
-
+        
     //
     // Calibration Results containers
@@ -1630 +1637 @@
         calcalc.SetOutputPath(fPathOut);
         calcalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
+        timecalc.SetOutputPath(fPathOut);
+        timecalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
     }
 
@@ -1668 +1677 @@
     filltme.SetDrawOption(drawoption.Data());
   */
-    //
-    // Apply a filter against cosmics
-    // (will have to be needed in the future
-    // when the calibration hardware-trigger is working)
-    //
-    MFCosmics cosmics;
-    MContinue cont(&cosmics);
-
     MTaskEnv taskenv("ExtractSignal");
     taskenv.SetDefault(fExtractor ? fExtractor : &extract2);
@@ -1681 +1682 @@
     tlist.AddToList(&merge);
     tlist.AddToList(&apply);
+
+    MPedCalcPedRun           pedcalc;
+    pedcalc.SetWindowSize(fExtractor 
+                          ? (Int_t)TMath::Nint(fExtractor->GetNumHiGainSamples())
+                          : (Int_t)TMath::Nint(extract2.GetNumHiGainSamples())
+                          );
+    pedcalc.SetRange(fExtractor 
+                     ? fExtractor->GetHiGainFirst()
+                     : extract2.GetHiGainFirst(), 
+                     fExtractor 
+                     ? fExtractor->GetHiGainLast()
+                     : extract2.GetHiGainLast()
+                     );
+
+    if (IsIntensity())
+      tlist.AddToList(&pedcalc);
+
+    MCalibColorSet colorset;
+    tlist.AddToList(&colorset);
+
     tlist.AddToList(&taskenv);
     tlist.AddToList(&pinext);
@@ -1695 +1716 @@
     
     //
-    // FIXME: This is not yet implemented in the classes!!!
-    // 
+    // Apply a filter against cosmics
+    // (will have to be needed in the future
+    // when the calibration hardware-trigger is working)
+    //
+    MFCosmics cosmics;
+    MContinue cont(&cosmics);
+
     if (fColor == MCalibrationCam::kCT1)
       tlist.AddToList(&cont);
-
-    MCalibColorSet colorset;
-    tlist.AddToList(&colorset);
 
     MCalibColorSteer steer;