Changeset 6304


Ignore:
Timestamp:
02/09/05 10:14:04 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6302 r6304  
    2525   * mjobs/MJPedestal.[h,cc]
    2626   * mjobs/badpixels_0_559.rc
     27   * callisto.rc
    2728     - allow exclusion of bad pixels from the beginning (default is
    2829       Pixel 0 and 559).
  • trunk/MagicSoft/Mars/callisto.rc

    r6264 r6304  
    2929#MJPedestalC1.PathOut: .
    3030#MJPedestalC2.PathOut: .
     31#MJPedestalC1.BadPixelsFile: mjobs/badpixels_0_559.rc
    3132#MJPedestalC1.ReferenceFile: mjobs/pedestalref.rc
    3233#MJPedestalC2.ReferenceFile: mjobs/pedestalref.rc
     
    302303# -------------------------------------------------------------------------
    303304#MJCalibrateSignal.ExtractSignal.LoGainSwitch:    150
    304 #MJCalibrateSignal.ExtractSignal.HiGainFirst:       3
    305 #MJCalibrateSignal.ExtractSignal.HiGainLast:       17
    306 #MJCalibrateSignal.ExtractSignal.LoGainFirst:       3
     305#MJCalibrateSignal.ExtractSignal.HiGainFirst:       0
     306#MJCalibrateSignal.ExtractSignal.HiGainLast:       20
     307#MJCalibrateSignal.ExtractSignal.LoGainFirst:       0
    307308#MJCalibrateSignal.ExtractSignal.LoGainLast:       14
    308 #MJCalibrateSignal.ExtractInterlaced.HiGainFirst:    0
    309 #MJCalibrateSignal.ExtractInterlaced.HiGainLast:    14
     309#MJCalibrateSignal.ExtractInterlaced.HiGainFirst:   0
     310#MJCalibrateSignal.ExtractInterlaced.HiGainLast:   14
    310311
    311312# -------------------------------------------------------------------------
  • trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

    r5582 r6304  
    476476{
    477477
    478   TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 900);
     478  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
    479479
    480480  TString option(opt);
     
    505505 
    506506  pad->SetBorderMode(0);
    507   pad->Divide(1,win);
     507  if (win > 1)
     508    pad->Divide(1,win);
    508509
    509510  Int_t cwin = 1;
  • trunk/MagicSoft/Mars/mjobs/MJPedestal.h

    r6302 r6304  
    22#define MARS_MJPedestal
    33
    4 #ifndef MARS_MJob
    5 #include "MJob.h"
    6 #endif
    74#ifndef MARS_MJCalib
    85#include "MJCalib.h"
     
    2623class MEvtLoop;
    2724
    28 class MJPedestal : public MJob, public MJCalib
     25class MJPedestal : public MJCalib
    2926{
    3027private:
     
    8885    const char*  GetOutputFileName() const;
    8986
     87    void ReadReferenceFile();
     88   
    9089public:
    9190    MJPedestal(const char *name=NULL, const char *title=NULL);
Note: See TracChangeset for help on using the changeset viewer.