Changeset 2797 for trunk/MagicSoft/Mars

Timestamp:

01/13/04 17:44:51 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/calibration.C (modified) (6 diffs)
• manalysis/MExtractSignal.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -6 +6 @@
  2004/01/13: Markus Gaug
  
+   * manalysis/MExtractSignal.h
+     - seems that the reduced light intensity of the CT1 Pulser
+       results in broader pulses -> Set Default time slices to [3,10]
+
    * mhist/MHCamera.cc
      - make Stat Window in option 'proj' bigger

trunk/MagicSoft/Mars/macros/calibration.C

@@ -23 +23 @@
 \* ======================================================================== */
 
-void calibration(TString pedname="/mnt/Data/rootdata/2003_12_01/20031130_03340_P_CrabNebula_E.root",
-                 TString calname="/mnt/Data/rootdata/2003_12_01/20031130_03341_C_CrabNebula_E.root")
+void calibration(TString pedname="/mnt/Data/rootdata/Miscellaneous/2003_12_19/20031218_03522_P_Park_E.root",
+                 TString calname="/mnt/Data/rootdata/Miscellaneous/2003_12_19/20031218_03527_C_Park_E.root")
 {
 
@@ -63 +63 @@
 
     MStatusDisplay *d1 = new MStatusDisplay;
- 
-    // Set update time to 3s
+
+    //Set update time to 3s
     d1->SetUpdateTime(3000);
  
@@ -121 +121 @@
     tlist2.AddToList(&calcalc);
 
-    MHCamEvent hist2;
-    hist2.SetType(8);
-    plist2.AddToList(&hist2);
-    MFillH fill2("MHCamEvent", "MCalibrationCam");
-    tlist2.AddToList(&fill2);
-
-    MStatusDisplay *d2 = new MStatusDisplay;
-    d2->SetUpdateTime(3000);
-
     //
     // Create and setup the eventloop
@@ -135 +126 @@
     MEvtLoop evtloop2;
     evtloop2.SetParList(&plist2);
-    evtloop2.SetDisplay(d2);
 
     //
@@ -151 +141 @@
     cam.Print();
 
-    //
-    // Here we are confronted to a serious bug in ROOT:
-    // If we do not apply the next command, gPad will get
-    // screwed up completely: (Thanks to tbretz for finding out
-    // the reason during several hours!!!)
-    //
-    gROOT->GetListOfCanvases()->Delete();
-
-    MHCamEvent &h    = *(MHCamEvent*)plist2->FindObject("MHCamEvent");
-    MHCamera &disp0  = *h.GetHistByName();
-    MHCamera disp1   (geomcam, "MCalibrationCam;q", "Fitted Mean Charges");
-    MHCamera disp3   (geomcam, "MCalibrationCam;sigmaq", "Sigma of Fitted Mean Charges");
-    MHCamera disp5   (geomcam, "MCalibrationCam;probq", "Probability of Fit");
-    MHCamera disp6   (geomcam, "MCalibrationCam;t", "Arrival Times");
-    MHCamera disp7   (geomcam, "MCalibrationCam;sigmat", "Sigma of Arrival Times");
-    MHCamera disp8   (geomcam, "MCalibrationCam;probt", "Probability of Time Fit");
-    MHCamera disp9   (geomcam, "MCalibrationCam;ped", "Pedestals");
-    MHCamera disp10  (geomcam, "MCalibrationCam;pedrms", "Pedestal RMS");
-    MHCamera disp11  (geomcam, "MCalibrationCam;rsigma", "Reduced Sigmas");
-    MHCamera disp12  (geomcam, "MCalibrationCam;phe", "Nr. of Phe's (F-Factor Method)");
-    MHCamera disp13  (geomcam, "MCalibrationCam;convphe", "Conversion Factor (F-Factor Method)");
-    MHCamera disp14  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
-    MHCamera disp15  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
-    MHCamera disp16  (geomcam, "MCalibrationCam;sigsqchargesq", "Sigma Square per Charges Square");
+    MHCamEvent camevt;
+    MHCamera disp1   (geomcam, "MCalibrationPix;Charge", "Fitted Mean Charges");
+    MHCamera disp3   (geomcam, "MCalibrationPix;SigmaCharge", "Sigma of Fitted Charges");
+    MHCamera disp5   (geomcam, "MCalibrationPix;ChargeProb", "Probability of Fit");
+    MHCamera disp6   (geomcam, "MCalibrationPix;Time", "Arrival Times");
+    MHCamera disp7   (geomcam, "MCalibrationPix;SigmaTime", "Sigma of Arrival Times");
+    MHCamera disp8   (geomcam, "MCalibrationPix;TimeChiSquare", "Chi Square of Time Fit");
+    MHCamera disp9   (geomcam, "MCalibrationPix;Ped", "Pedestals");
+    MHCamera disp10  (geomcam, "MCalibrationPix;PedRms", "Pedestal RMS");
+    MHCamera disp11  (geomcam, "MCalibrationPix;RSigma", "Reduced Sigmas");
+    MHCamera disp12  (geomcam, "MCalibrationPix;PheFFactorMethod", "Nr. of Phe's (F-Factor Method)");
+    MHCamera disp13  (geomcam, "MCalibrationPix;MeanConversionFFactorMethod", "Conversion Factor (F-Factor Method)");
+    MHCamera disp14  (geomcam, "MCalibrationPix;MeanPhotInsidePlexiglass", "Nr. of Photons (Blind Pixel Method)");
+    MHCamera disp15  (geomcam, "MCalibrationPix;MeanConversionBlindPixelMethod", "Conversion Factor (Blind Pixel Method)");
+    MHCamera disp16  (geomcam, "MCalibrationPix;RSigma/Charge", "Reduced Sigma per Charge");
 
     disp1.SetCamContent(*cam, 0);
@@ -206 +187 @@
 
 
-    disp1.SetYTitle("Q [FADC counts]");
+    disp1.SetYTitle("Charge [FADC counts]");
     //    disp2.SetYTitle("\\Delta Q [FADC counts]");
-    disp3.SetYTitle("\\sigma_{Q} [FADC counts]");
+    disp3.SetYTitle("\\sigma_{Charge} [FADC counts]");
     //    disp4.SetYTitle("\\Delta {\\sigma_{Q}} [FADC counts]");
-    disp5.SetYTitle("P_{Q} [au]");
-    disp6.SetYTitle("T [FADC slices]");
-    disp7.SetYTitle("\\sigma_{T} [FADC slices]");
-    disp8.SetYTitle("P_{T} [au]");
-    disp9.SetYTitle("P [Total FADC counts ]");
-    disp10.SetYTitle("RMS_{P} [Total FADC counts ]");
-    disp11.SetYTitle("\\sigma^{2}_{Q} - RMS^{2}_{P} [FADC counts^2]");
-    disp12.SetYTitle("Nr Phe's");
-    disp13.SetYTitle("Conversion Factor [Phe/FADC count]");
-    disp14.SetYTitle("Nr Photons");
-    disp15.SetYTitle("Conversion Factor [Ph/FADC count]");
-    disp16.SetYTitle("Sigma^2 per Charge^2 [1]");
+    disp5.SetYTitle("P_{Charge} [1]");
+    disp6.SetYTitle("Arr. Time [Time Slice Nr.]");
+    disp7.SetYTitle("\\sigma_{Time} [Time Slices]");
+    disp8.SetYTitle("\\chi^{2}_{Time} [1]");
+    disp9.SetYTitle("Ped [FADC Counts ]");
+    disp10.SetYTitle("RMS_{Ped} [FADC Counts ]");
+    disp11.SetYTitle("\\sqrt{\\sigma^{2}_{Charge} - RMS^{2}_{Ped}} [FADC Counts]");
+    disp12.SetYTitle("Nr. Photo-Electrons [1]");
+    disp13.SetYTitle("Conversion Factor [PhE/FADC Count]");
+    disp14.SetYTitle("Nr. Photons [1]");
+    disp15.SetYTitle("Conversion Factor [Phot/FADC Count]");
+    disp16.SetYTitle("Reduced Sigma / Charge [1]");
 
     MStatusDisplay *d3 = new MStatusDisplay;

trunk/MagicSoft/Mars/manalysis/MExtractSignal.h

@@ -50 +50 @@
   MExtractSignal(const char *name=NULL, const char *title=NULL);
 
-  void SetRange(Byte_t hifirst=3, Byte_t hilast=8, Byte_t lofirst=3, Byte_t lolast=8);
+  void SetRange(Byte_t hifirst=3, Byte_t hilast=10, Byte_t lofirst=3, Byte_t lolast=10);
   void SetSaturationLimit(Byte_t lim)      { fSaturationLimit = lim; }