Changeset 6042 for trunk


Ignore:
Timestamp:
01/27/05 12:05:39 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6041 r6042  
    4343     - modify default calibration to equiv. photo-electrons
    4444     - allow for setting of MC, Raw or Root-file type in callisto.rc
     45
     46   * callisto.rc
     47     - updated conf. file
     48
    4549
    4650 2005/01/27 Thomas Bretz
  • trunk/MagicSoft/Mars/callisto.rc

    r6031 r6042  
    5252# -------------------------------------------------------------------------
    5353MJPedestalC1.ExtractSignal: MExtractTimeAndChargeDigitalFilter
    54 #MJPedestalC1.ExtractSignal: MExtractFixedWindowPeakSearch
    5554
    5655# -------------------------------------------------------------------------
     
    5857# weights file depending on what you are extracting
    5958# -------------------------------------------------------------------------
    60 MJPedestalC2.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
    61 MJPedestalY2.ExtractSignal.WeightsFile:      msignal/cosmics_weights.dat
    62 MJPedestalY3.ExtractSignal.WeightsFile:      msignal/cosmics_weights.dat
    63 MJCalibration.ExtractSignal.WeightsFile:     msignal/calibration_weights_UV.dat
    64 MJCalibrateSignal.ExtractSignal.WeightsFile: msignal/cosmics_weights.dat
    65 
     59MJPedestalC2.ExtractSignal.WeightsFile:          msignal/calibration_weights_UV.dat
     60MJPedestalY2.ExtractSignal.WeightsFile:          msignal/cosmics_weights.dat
     61MJPedestalY3.ExtractSignal.WeightsFile:          msignal/cosmics_weights.dat
     62MJCalibration.ExtractSignal.WeightsFile:         msignal/calibration_weights_UV.dat
     63MJCalibrateSignal.ExtractSignal.WeightsFile:     msignal/cosmics_weights.dat
     64MJCalibrateSignal.ExtractInterlaced.WeightsFile: msignal/calibration_weights_UV.dat
    6665
    6766# -------------------------------------------------------------------------
     
    6968# -------------------------------------------------------------------------
    7069# Switch on relative time calibration
    71 # MJCalibration.RelTimeCalibration: Yes
     70#MJCalibration.RelTimeCalibration: Yes
    7271# Switch on intensity calibration
    7372#MJCalibration.IntensityCalibration: Yes
     
    156155#MJCalibration.ExtractSignal.OffsetFromWindow:  1
    157156#MJCalibration.ExtractSignal.LoGainPeakShift:   0
    158 #MJCalibration.ExtractSignal.LoGainSwitch:    200
     157MJCalibration.ExtractSignal.LoGainSwitch:     200
    159158
    160159# -------------------------------------------------------------------------
     
    185184#MJCalibration.MCalibrationChargeCalc.PheErrLimit:        3.5
    186185
     186#MJCalibration.MHCalibrationChargeCam.Debug:        no
     187#MJCalibration.MHCalibrationChargeCam.LoGain:       yes
     188#MJCalibration.MHCalibrationChargeCam.Oscillations: yes
     189#MJCalibration.MHCalibrationChargeCam.SizeCheck:    yes
     190#MJCalibration.MHCalibrationChargeCam.Averageing:   yes
     191#MJCalibration.MHCalibrationChargeCam.HiGainNbins:  500
     192#MJCalibration.MHCalibrationChargeCam.HiGainFirst:  -100.5
     193#MJCalibration.MHCalibrationChargeCam.HiGainLast:   1899.5
     194#MJCalibration.MHCalibrationChargeCam.LoGainNbins:   500
     195#MJCalibration.MHCalibrationChargeCam.LoGainFirst:  -100.5
     196#MJCalibration.MHCalibrationChargeCam.LoGainLast:   899.5
     197#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit: 1.
     198MJCalibration.MHCalibrationChargeCam.TimeUpperLimit: 3.
     199#MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
     200#MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005
     201#MJCalibration.MHCalibrationChargeCam.ProbLimit:    0.0001
     202#MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005
     203#MJCalibration.MHCalibrationChargeCam.PulserFrequency: 500
     204
     205#MJCalibration.MHCalibrationRelTimeCam.Debug:        no
     206#MJCalibration.MHCalibrationRelTimeCam.LoGain:       no
     207#MJCalibration.MHCalibrationRelTimeCam.Oscillations:  yes
     208#MJCalibration.MHCalibrationRelTimeCam.SizeCheck:    yes
     209#MJCalibration.MHCalibrationRelTimeCam.Averageing:   yes
     210#MJCalibration.MHCalibrationRelTimeCam.HiGainNbins:  210
     211#MJCalibration.MHCalibrationRelTimeCam.HiGainFirst:  -5.
     212#MJCalibration.MHCalibrationRelTimeCam.HiGainLast:   10.
     213#MJCalibration.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
     214#MJCalibration.MHCalibrationRelTimeCam.ProbLimit:    0.00001
     215#MJCalibration.MHCalibrationRelTimeCam.OverflowLimit: 0.005
     216#MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500
     217
    187218# -------------------------------------------------------------------------
    188219# Use this to change the behaviour of the calibration
     
    220251#MJPedestalY2.DataCheck: No
    221252#MJPedestalY3.DataCheck: No
    222 #MJPedestalY1.Display: None
    223 #MJPedestalY2.Display: None
    224 #MJPedestalY3.Display: None
    225253#MJPedestalY1.UseData: Yes
    226254#MJPedestalY2.UseData: Yes
     
    253281
    254282# -------------------------------------------------------------------------
    255 # Use this if you want to change the initialization of the signal extractor
    256 # -------------------------------------------------------------------------
    257 #MJCalibrateSignal.ExtractSignal.LoGainSwitch:    200
    258 #MJCalibrateSignal.ExtractSignal.HiGainFirst:     2
    259 #MJCalibrateSignal.ExtractSignal.HiGainLast:     16
     283# Use this if you want to change the signal extractor
     284# -------------------------------------------------------------------------
     285#MJCalibrateSignal.ExtractSignal.LoGainSwitch:    150
    260286
    261287# -------------------------------------------------------------------------
     
    263289# -------------------------------------------------------------------------
    264290# Used for data-check (eg. raw files are read)
    265 #MJCalibrateSignal.DataCheck: No
     291#MJCalibrateSignal.RawData: no
     292# Used for MC
     293#MJCalibrateSignal.MC: no
    266294#MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
    267295#MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
    268 #MJCalibrateSignal.MCalibrateData.SignalType: Default
     296
     297#MJCalibrateSignal.Interlaced: yes
     298#MJCalibrateSignal.RelTimesUpdate: no
     299#MJCalibrateSignal.HiLoCalibration: no
    269300
    270301# -------------------------------------------------------------------------
    271302# Setup level for determining of bad pixels
    272303# -------------------------------------------------------------------------
    273 MJCalibrateSignal.MBadPixelsCalc.PedestalLevel:         3.0
    274 MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
    275 #MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    2
     304#MJCalibrateSignal.MBadPixelsCalc.PedestalLevel:         3.0
     305#MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
     306#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    3
    276307#MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes
    277308#MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes
     
    280311#MJCalibrateSignal.MBadPixelsTreat.UseCentralPixel:    no
    281312#MJCalibrateSignal.MBadPixelsTreat.HardTreatment:      no
     313
     314# -------------------------------------------------------------------------
     315# Setup interlaced calibration events
     316# -------------------------------------------------------------------------
     317#MJCalibrateSignal.MHCalibrationChargeCam.Debug:        no
     318#MJCalibrateSignal.MHCalibrationChargeCam.LoGain:       yes
     319MJCalibrateSignal.MHCalibrationChargeCam.Oscillations:  no
     320#MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck:    yes
     321#MJCalibrateSignal.MHCalibrationChargeCam.Averageing:   yes
     322#MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins:  500
     323#MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst:  -100.5
     324#MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast:   1899.5
     325MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins:   250
     326#MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst:  -100.5
     327#MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast:   899.5
     328#MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit: 1.
     329MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit: 3.
     330#MJCalibrateSignal.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
     331#MJCalibrateSignal.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005
     332#MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit:    0.0001
     333#MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit: 0.005
     334MJCalibrateSignal.MHCalibrationChargeCam.PulserFrequency: 50
     335
     336# -------------------------------------------------------------------------
     337# Setup relative time interlaced calibration
     338# -------------------------------------------------------------------------
     339#MJCalibrateSignal.MHCalibrationRelTimeCam.Debug:        no
     340#MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain:       no
     341MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations:  no
     342#MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck:    yes
     343#MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing:   yes
     344#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainNbins:  210
     345#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainFirst:  -5.
     346#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainLast:   10.
     347#MJCalibrateSignal.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
     348#MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit:    0.00001
     349#MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit: 0.005
     350MJCalibrateSignal.MHCalibrationRelTimeCam.PulserFrequency: 50
     351
     352
Note: See TracChangeset for help on using the changeset viewer.