Changeset 6304

Timestamp:

02/09/05 10:14:04 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.rc (modified) (2 diffs)
• mhcalib/MHGausEvents.cc (modified) (2 diffs)
• mjobs/MJPedestal.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
    * mjobs/MJPedestal.[h,cc]
    * mjobs/badpixels_0_559.rc
+   * callisto.rc
      - allow exclusion of bad pixels from the beginning (default is 
        Pixel 0 and 559).

trunk/MagicSoft/Mars/callisto.rc

@@ -29 +29 @@
 #MJPedestalC1.PathOut: .
 #MJPedestalC2.PathOut: .
+#MJPedestalC1.BadPixelsFile: mjobs/badpixels_0_559.rc
 #MJPedestalC1.ReferenceFile: mjobs/pedestalref.rc
 #MJPedestalC2.ReferenceFile: mjobs/pedestalref.rc
@@ -302 +303 @@
 # -------------------------------------------------------------------------
 #MJCalibrateSignal.ExtractSignal.LoGainSwitch:    150
-#MJCalibrateSignal.ExtractSignal.HiGainFirst:       3
-#MJCalibrateSignal.ExtractSignal.HiGainLast:       17
-#MJCalibrateSignal.ExtractSignal.LoGainFirst:       3
+#MJCalibrateSignal.ExtractSignal.HiGainFirst:       0
+#MJCalibrateSignal.ExtractSignal.HiGainLast:       20
+#MJCalibrateSignal.ExtractSignal.LoGainFirst:       0
 #MJCalibrateSignal.ExtractSignal.LoGainLast:       14
-#MJCalibrateSignal.ExtractInterlaced.HiGainFirst:    0
-#MJCalibrateSignal.ExtractInterlaced.HiGainLast:    14
+#MJCalibrateSignal.ExtractInterlaced.HiGainFirst:   0
+#MJCalibrateSignal.ExtractInterlaced.HiGainLast:   14
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -476 +476 @@
 {
 
-  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 900);
+  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
 
   TString option(opt);
@@ -505 +505 @@
   
   pad->SetBorderMode(0);
-  pad->Divide(1,win);
+  if (win > 1)
+    pad->Divide(1,win);
 
   Int_t cwin = 1;

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -2 +2 @@
 #define MARS_MJPedestal
 
-#ifndef MARS_MJob
-#include "MJob.h"
-#endif
 #ifndef MARS_MJCalib
 #include "MJCalib.h"
@@ -26 +23 @@
 class MEvtLoop;
 
-class MJPedestal : public MJob, public MJCalib
+class MJPedestal : public MJCalib
 {
 private:
@@ -88 +85 @@
     const char*  GetOutputFileName() const;
 
+    void ReadReferenceFile();
+    
 public:
     MJPedestal(const char *name=NULL, const char *title=NULL);