Index: trunk/MagicSoft/Mars/callisto.rc =================================================================== --- trunk/MagicSoft/Mars/callisto.rc (revision 6912) +++ trunk/MagicSoft/Mars/callisto.rc (revision 6913) @@ -326,18 +326,35 @@ # ------------------------------------------------------------------------- #MJCalibrateSignal.MPedCalcFundamental.PedestalUpdate: yes -#MJCalibrateSignal.MPedCalcFundamental.NumEventsDump: 1500 -#MJCalibrateSignal.MPedCalcFundamental.ExtractWinFirst: 17 -#MJCalibrateSignal.MPedCalcFundamental.ExtractWinSize: 6 -#MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst: 0 -#MJCalibrateSignal.MPedCalcFundamental.CheckWinSize: 29 -#MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar: 40 +#MJCalibrateSignal.MPedCalcFundamental.NumDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.NumEventsDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.NumAreasDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.NumSectorsDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.ExtractWinFirst: 17 +#MJCalibrateSignal.MPedCalcFundamental.ExtractWinSize: 6 +#MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst: 0 +#MJCalibrateSignal.MPedCalcFundamental.CheckWinSize: 29 +#MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar: 40 + +#MJCalibrateSignal.MPedCalcFromExtractorRndm.PedestalUpdate: yes +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumEventsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumAreasDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumSectorsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinFirst: 17 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinSize: 6 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinFirst: 0 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinSize: 29 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxHiGainVar: 40 #MJCalibrateSignal.MPedCalcFromExtractor.PedestalUpdate: yes -#MJCalibrateSignal.MPedCalcFromExtractor.NumEventsDump: 1500 -#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinFirst: 17 -#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinSize: 6 -#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst: 0 -#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize: 29 -#MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar: 40 +#MJCalibrateSignal.MPedCalcFromExtractor.NumDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.NumEventsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.NumAreasDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.NumSectorsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinFirst: 17 +#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinSize: 6 +#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst: 0 +#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize: 29 +#MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar: 40 # ------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc =================================================================== --- trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc (revision 6913) +++ trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc (revision 6913) @@ -0,0 +1,461 @@ +# ========================================================================== +############################################################################# +# ========================================================================== +# General +# ========================================================================== +############################################################################# +# ========================================================================== + +# ------------------------------------------------------------------------- +# Use this if you want to setup the logging stream for the jobs +# (overwrites command line options) +# ------------------------------------------------------------------------- +#MLog.VerbosityLevel: 2 +#MLog.DebugLevel: 1 +#MLog.NoColors: yes + +# ========================================================================== +############################################################################# +# ========================================================================== +# Calibration +# ========================================================================== +############################################################################# +# ========================================================================== + +# ------------------------------------------------------------------------- +# Use this if you want to write the MJPedestal output somewhere +# If you don't want it, it is written to the calibration output anyhow. +# ------------------------------------------------------------------------- +#MJPedestalC1.PathOut: . +#MJPedestalC2.PathOut: . + +# ------------------------------------------------------------------------- +# Use this if you want to modify the exclusion of pixels from the beginning +# (default: Pixel 0 and 559) +# ------------------------------------------------------------------------- +MJPedestalC1.BadPixelsFile: mjobs/badpixels_0_559.rc + +# ------------------------------------------------------------------------- +# Use this if you want to modify files containing information about the +# reference lines in the status display +# ------------------------------------------------------------------------- +#MJPedestalC1.ReferenceFile: mjobs/pedestalref.rc +#MJPedestalC2.ReferenceFile: mjobs/pedestalref.rc +MJCalibration.ReferenceFile: mjobs/calibrationref_Dec04.rc +MJCalibration.MHCalibrationRelTimeCam.ReferenceFile: mjobs/calibrationref_Dec04.rc +MJCalibration.MHCalibrationChargeCam.ReferenceFile: mjobs/calibrationref_Dec04.rc + +# ------------------------------------------------------------------------- +# Use this to define where the calibration output is stored. The filename +# is created from the sequence number. If nothing is specified '.' is +# assumed. (overwrites command line options) +# ------------------------------------------------------------------------- +#MJCalibration.PathOut: calped + +# ------------------------------------------------------------------------- +# Use this to define where the program should search for the pedestal +# and calibration files defined in the sequence. To use the local +# directory use '.' If nothing is specified the default path in the +# datacenter is used. (overwrites command line options) +# ------------------------------------------------------------------------- +#MJPedestalC1.PathData: /data/MAGIC/Period016/ +#MJPedestalC2.PathData: /data/MAGIC/Period016/ +#MJCalibration.PathData: /data/MAGIC/Period016/ + +# ------------------------------------------------------------------------- +# Define here which signal extractor you are going to use for the +# whole calibration chain +# ------------------------------------------------------------------------- +MJPedestalC1.ExtractSignal: MExtractTimeAndChargeSpline +# ------------------------------------------------------------------------- +# Possibilities for a different extractor +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractSignal: MExtractTimeAndChargeDigitalFilter, MExtractTimeAndChargeDigitalFilterPeakSearch, MExtractTimeAndChargeSlidingWindow +# ------------------------------------------------------------------------- +# Define here parameters valid for all extractors above +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractSignal.HiGainFirst: 0 +#MJPedestalC1.ExtractSignal.HiGainLast: 15 +#MJPedestalC1.ExtractSignal.LoGainFirst: 3 +#MJPedestalC1.ExtractSignal.LoGainLast: 14 +#MJPedestalC1.ExtractSignal.SaturationLimit: 250 +#MJPedestalC1.ExtractSignal.OffsetLoGain: 1.51 +#MJPedestalC1.ExtractSignal.LoGainSwitch: 150 +#MJPedestalC1.ExtractSignal.LoGainStartShift: -2.8 +# ------------------------------------------------------------------------- +# Define here parameters valid for the spline: +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractSignal.Resolution: 0.05 +#MJPedestalC1.ExtractSignal.RiseTimeHiGain: 0.5 +MJPedestalC1.ExtractSignal.FallTimeHiGain: 0.5 +#MJPedestalC1.ExtractSignal.LoGainStretch: 1.5 +#MJPedestalC1.ExtractSignal.ExtractionType: Integral +#MJPedestalC1.ExtractSignal.ExtractionType: Amplitude +# ------------------------------------------------------------------------- +# Define here parameters valid for the sliding window: +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractSignal.HiGainWindowSize: 6 +#MJPedestalC1.ExtractSignal.LoGainWindowSize: 6 +# ------------------------------------------------------------------------- +# Define here parameters valid for the digital filter with peak search: +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractSignal.OffsetLeftFromPeak: 3 +#MJPedestalC1.ExtractSignal.OffsetRightFromPeak: 3 +#MJPedestalC1.ExtractSignal.PeakSearchWindowSize: 2 +#MJPedestalC1.ExtractSignal.HiGainFailureLimit: 10 +#MJPedestalC1.ExtractSignal.LoGainFailureLimit: 25 + +# ------------------------------------------------------------------------- +# In the case of the Digital filter you have to overwrite the default +# weights file depending on what you are extracting +# ------------------------------------------------------------------------- +#MJPedestalC2.ExtractSignal.WeightsFile: msignal/calibration_weights_UV4.dat +#MJPedestalY2.ExtractSignal.WeightsFile: msignal/cosmics_weights4.dat +#MJPedestalY3.ExtractSignal.WeightsFile: msignal/cosmics_weights4.dat +#MJCalibration.ExtractSignal.WeightsFile: msignal/calibration_weights_UV4.dat +#MJCalibrateSignal.ExtractSignal.WeightsFile: msignal/cosmics_weights4.dat +#MJCalibrateSignal.ExtractInterlaced.WeightsFile: msignal/calibration_weights_UV4.dat +#MJCalibrateSignal.ExtractSignal.LoGainStretch: 1.5 +#MJCalibrateSignal.ExtractInterlaced.LoGainStretch: 1.5 + +# ------------------------------------------------------------------------- +# Configure MJCalibration +# ------------------------------------------------------------------------- +# Switch on relative time calibration +#MJCalibration.RelTimeCalibration: Yes +# Switch on intensity calibration +#MJCalibration.IntensityCalibration: Yes +# Set color to be used +#MJCalibration.Color: +# Type of used data format: raw, root, mc +#MJCalibration.DataType: Root +# Type of displayed plots: Full,DataCheck,Normal +#MJCalibration.Display: datacheck +# Write additinal debug output +#MJCalibration.Debug: No +# Use blind pixel +#MJCalibration.UseBlindPixel: No +# Use pin diode +#MJCalibration.UsePINDiode: No +# Use pixel check option +#MJCalibration.PixelCheck: No +#MJCalibTest.PixelCheck: No + +# ------------------------------------------------------------------------- +# In case of MOON DATA, uncomment the following lines: +# (better: call callisto with option "-moon") +# ------------------------------------------------------------------------- +#MJPedestalC1.UseHists: yes +#MJPedestalC2.UseHists: yes +#MJPedestalY1.UseHists: yes +#MJPedestalY2.UseHists: yes +#MJPedestalY3.UseHists: yes + +# ------------------------------------------------------------------------- +# You can choose the pedestal extraction algorithm/task. To use +# MPedCalcPedRun use the lines below. Be carefull, a pedestal file +# could be (if no pedestal file available) a data-file, too. +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractPedestal: MPedCalcPedRun +#MJPedestalC1.ExtractPedestal.ExtractWinFirst: 0 +#MJPedestalC1.ExtractPedestal.ExtractWinSize: 6 +#MJPedestalC1.ExtractPedestal.PedestalUpdate: no +#MJPedestalC1.ExtractPedestal.CheckWinFirst: 0 +#MJPedestalC1.ExtractPedestal.CheckWinSize: 29 + +#MJPedestalC2.ExtractPedestal: MPedCalcPedRun +#MJPedestalC2.ExtractPedestal.ExtractWinFirst: 0 +#MJPedestalC2.ExtractPedestal.ExtractWinSize: 6 +#MJPedestalC2.ExtractPedestal.PedestalUpdate: no +#MJPedestalC2.ExtractPedestal.CheckWinFirst: 0 +#MJPedestalC2.ExtractPedestal.CheckWinSize: 29 + +# ------------------------------------------------------------------------- +# You can choose the pedestal extraction algorithm/task. To use +# MPedCalcFromLoGain use the lines below. Be carefull, a pedestal file +# could be (if no pedestal file available) a data-file, too. +# ------------------------------------------------------------------------- +#MJPedestalC1.ExtractPedestal: MPedCalcFromLoGain +#MJPedestalC1.ExtractPedestal.ExtractWinFirst: 0 +#MJPedestalC1.ExtractPedestal.ExtractWinSize: 6 +#MJPedestalC1.ExtractPedestal.PedestalUpdate: no +#MJPedestalC1.ExtractPedestal.CheckWinFirst: 0 +#MJPedestalC1.ExtractPedestal.CheckWinSize: 29 +#MJPedestalC1.ExtractPedestal.MaxHiGainVar: 40 + +#MJPedestalC2.ExtractPedestal: MPedCalcFromLoGain +#MJPedestalC2.ExtractPedestal.ExtractWinFirst: 0 +#MJPedestalC2.ExtractPedestal.ExtractWinSize: 6 +#MJPedestalC2.ExtractPedestal.PedestalUpdate: no +#MJPedestalC2.ExtractPedestal.CheckWinFirst: 0 +#MJPedestalC2.ExtractPedestal.CheckWinSize: 29 +#MJPedestalC2.ExtractPedestal.MaxHiGainVar: 40 + +# ------------------------------------------------------------------------- +# Configure MJPedestalC1 and MJPedestalC2 +# ------------------------------------------------------------------------- +# Possible data type: Raw,Root,MC +#MJPedestalC1.DataType: Root +#MJPedestalC2.DataType: Root +#MJPedestalC3.DataType: Root +# Type of displayed plots: Full,DataCheck,None +#MJPedestalC1.Display: datacheck +#MJPedestalC2.Display: datacheck +#MJPedestalC3.Display: datacheck +# Maximum number of event processed in the loop +#MJPedestalC1.MaxEvents: 1000 +#MJPedestalC2.MaxEvents: 1000 +# Allow to overwrite existing files with the output file +#MJPedestalC1.AllowOverwrite: No +#MJPedestalC2.AllowOverwrite: No +# Use data runs from the sequence instead of calibration runs +#MJPedestalC1.UseData: No +#MJPedestalC2.UseData: No + + +# ------------------------------------------------------------------------- +# Use this if you want to change the software low-gain switch +# ------------------------------------------------------------------------- +MJCalibration.ExtractSignal.LoGainSwitch: 170 + +# ------------------------------------------------------------------------- +# Use this if you want to change the higain-vs. logain intercalibration +# ------------------------------------------------------------------------- +MJCalibration.HiLoCalibFile: mjobs/hilocalib_sp1.root +#MJCalibration.HiLoCalibration: yes + +# ------------------------------------------------------------------------- +# Use this if you want to change the time extractor for the calibration +# and automatically the data extraction +# ------------------------------------------------------------------------- +#MJCalibration.ExtractTime: +#MJCalibration.ExtractTime: MExtractTimeFastSpline +#MJCalibration.ExtractTime.HiGainFirst: 0 +#MJCalibration.ExtractTime.HiGainLast: 7 +#MJCalibration.ExtractTime.LoGainFirst: 3 +#MJCalibration.ExtractTime.LoGainLast: 8 +#MJCalibration.ExtractTime.WindowSizeHiGain: 6 +#MJCalibration.ExtractTime.WindowSizeLoGain: 6 +#MJCalibration.ExtractTime.OffsetLoGain: 1.51 + +# ------------------------------------------------------------------------- +# Use this to change the behaviour of the calibration +# ------------------------------------------------------------------------- +# Type if you set a colour explicitely from outside (only for MC!!!) +#MJCalibration.MCalibColorSet.ExplicitColor: green,blue,uv,ct1 + +#MJCalibration.MCalibrationChargeCalc.ChargeLimit: 2.5 +#MJCalibration.MCalibrationChargeCalc.ChargeErrLimit: 0 +#MJCalibration.MCalibrationChargeCalc.ChargeRelErrLimit: 1 +#MJCalibration.MCalibrationChargeCalc.Debug: no + +#MJCalibration.MCalibrationChargeCalc.FFactorErrLimit: 4.5 +#MJCalibration.MCalibrationChargeCalc.LambdaErrLimit: 0.2 +#MJCalibration.MCalibrationChargeCalc.LambdaCheckLimit: 0.5 +#MJCalibration.MCalibrationChargeCalc.PheErrLimit: 3.5 + +#MJCalibration.MHCalibrationChargeCam.Debug: no +#MJCalibration.MHCalibrationChargeCam.LoGain: yes +#MJCalibration.MHCalibrationChargeCam.Oscillations: yes +#MJCalibration.MHCalibrationChargeCam.SizeCheck: yes +#MJCalibration.MHCalibrationChargeCam.Averageing: yes +#MJCalibration.MHCalibrationChargeCam.HiGainNbins: 500 +#MJCalibration.MHCalibrationChargeCam.HiGainFirst: -100.125 +#MJCalibration.MHCalibrationChargeCam.HiGainLast: 1899.875 +#MJCalibration.MHCalibrationChargeCam.LoGainNbins: 500 +#MJCalibration.MHCalibrationChargeCam.LoGainFirst: -100.25 +#MJCalibration.MHCalibrationChargeCam.LoGainLast: 899.75 +#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit: 1. +#MJCalibration.MHCalibrationChargeCam.TimeUpperLimit: 3. +#MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02 +#MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 +#MJCalibration.MHCalibrationChargeCam.ProbLimit: 0.00000001 +#MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005 +#MJCalibration.MHCalibrationChargeCam.PulserFrequency: 500 + +#MJCalibration.MHCalibrationRelTimeCam.Debug: no +#MJCalibration.MHCalibrationRelTimeCam.LoGain: no +#MJCalibration.MHCalibrationRelTimeCam.Oscillations: yes +#MJCalibration.MHCalibrationRelTimeCam.SizeCheck: yes +#MJCalibration.MHCalibrationRelTimeCam.Averageing: yes +#MJCalibration.MHCalibrationRelTimeCam.HiGainNbins: 210 +#MJCalibration.MHCalibrationRelTimeCam.HiGainFirst: -5. +#MJCalibration.MHCalibrationRelTimeCam.HiGainLast: 10. +#MJCalibration.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25 +#MJCalibration.MHCalibrationRelTimeCam.ProbLimit: 0.00001 +#MJCalibration.MHCalibrationRelTimeCam.OverflowLimit: 0.005 +#MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500 + + +# ========================================================================== +############################################################################# +# ========================================================================== +# Signal extraction +# ========================================================================== +############################################################################# +# ========================================================================== + +# ------------------------------------------------------------------------- +# Use a OutputPath if you want to write the results to a file +# ------------------------------------------------------------------------- +#MJCalibrateSignal.PathOut: . +#MJPedestalY1.PathOut: . +#MJPedestalY2.PathOut: . +#MJPedestalY3.PathOut: . +#MJPedestalY1.PathData: /data/MAGIC/Period016/ +#MJPedestalY2.PathData: /data/MAGIC/Period016/ +#MJPedestalY3.PathData: /data/MAGIC/Period016/ +#MJCalibrateSignal.PathData: /data/MAGIC/Period016/ +#MJCalibrateSignal.PathIn: . + +# ------------------------------------------------------------------------- +# If you want to change the behaviour of the pedestal extraction... +# ------------------------------------------------------------------------- +# Possible data type: Raw,Root,MC +#MJPedestalY1.DataType: Root +#MJPedestalY2.DataType: Root +#MJPedestalY3.DataType: Root +#MJPedestalY1.UseData: Yes +#MJPedestalY2.UseData: Yes +#MJPedestalY3.UseData: Yes +MJPedestalY1.MaxEvents: 500 +MJPedestalY2.MaxEvents: 2000 +MJPedestalY3.MaxEvents: 500 + +# ------------------------------------------------------------------------- +# Use Pulse Position check to define the extraction ranges for the data? +# ------------------------------------------------------------------------- +#MJPedestalY2.PulsePosCheck: yes +MJPedestalY2.ExtractWinLeft: 3.0 +MJPedestalY2.ExtractWinRight: 4.0 +#MJCalibrateSignal.ModifiedExtractWin: yes +# ------------------------------------------------------------------------- +# Define the Pulse Position check parameters: +# ------------------------------------------------------------------------- +#MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit: 255 +#MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit: 100 +#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired: 2 +#MJPedestalY2.PixelCheck: no + +#MJPedestalY.ExtractPedestal: MPedCalcFromLoGain +#MJPedestalY.ExtractPedestal.PedestalUpdate: no + +# ------------------------------------------------------------------------- +# Setup pedestal extractor for running through data +# ------------------------------------------------------------------------- +#MJCalibrateSignal.MPedCalcFundamental.PedestalUpdate: yes +#MJCalibrateSignal.MPedCalcFundamental.NumDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.NumEventsDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.NumAreasDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.NumSectorsDump: 500 +#MJCalibrateSignal.MPedCalcFundamental.ExtractWinFirst: 17 +#MJCalibrateSignal.MPedCalcFundamental.ExtractWinSize: 6 +#MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst: 0 +#MJCalibrateSignal.MPedCalcFundamental.CheckWinSize: 29 +#MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar: 40 + +#MJCalibrateSignal.MPedCalcFromExtractorRndm.PedestalUpdate: yes +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumEventsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumAreasDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumSectorsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinFirst: 17 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinSize: 6 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinFirst: 0 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinSize: 29 +#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxHiGainVar: 40 + +#MJCalibrateSignal.MPedCalcFromExtractor.PedestalUpdate: yes +#MJCalibrateSignal.MPedCalcFromExtractor.NumDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.NumEventsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.NumAreasDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.NumSectorsDump: 500 +#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinFirst: 17 +#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinSize: 6 +#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst: 0 +#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize: 29 +#MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar: 40 + +# ------------------------------------------------------------------------- +# Use this if you want to change to time from run headers instead of event time +# ------------------------------------------------------------------------- +#MJCalibrateSignal.MPointingPosInterpolate.TimeMode: eventtime, runtime + +# ------------------------------------------------------------------------- +# Use this if you want to change the signal extractor +# ------------------------------------------------------------------------- +MJCalibrateSignal.ExtractSignal.LoGainSwitch: 150 + +# ------------------------------------------------------------------------- +# Setup calibration of data +# ------------------------------------------------------------------------- +# Type of used data format: raw,root,MC +#MJCalibrateSignal.DataType: Root +# Type if you set a colour explicitely from outside (only for MC!!!) +#MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1 +#MJCalibrateSignal.MCalibrateData.PedestalFlag: Event +#MJCalibrateSignal.MCalibrateData.CalibrationMode: Default +#MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01 +#MJCalibrateSignal.MCalibrateData.CalibConvMaxLimit: 5. +#MJCalibrateSignal.Interlaced: yes +#MJCalibrateSignal.RelTimesUpdate: no +#MJCalibrateSignal.HiLoCalibration: no +#MJCalibrateSignal.PulsePosCheck: yes + +# ------------------------------------------------------------------------- +# Setup level for determining of bad pixels +# ------------------------------------------------------------------------- +#MJCalibrateSignal.MBadPixelsCalc.PedestalLevel: 3.0 +#MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0 +#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors: 3 +#MJCalibrateSignal.MBadPixelsTreat.UseInterpolation: yes +#MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes +#MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalRun: no +#MJCalibrateSignal.MBadPixelsTreat.ProcessTimes: yes +#MJCalibrateSignal.MBadPixelsTreat.UseCentralPixel: no +#MJCalibrateSignal.MBadPixelsTreat.HardTreatment: no + +# ------------------------------------------------------------------------- +# Setup interlaced calibration events histogramming +# ------------------------------------------------------------------------- +#MJCalibrateSignal.MHCalibrationChargeCam.Debug: no +#MJCalibrateSignal.MHCalibrationChargeCam.LoGain: yes +MJCalibrateSignal.MHCalibrationChargeCam.Oscillations: no +#MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck: yes +#MJCalibrateSignal.MHCalibrationChargeCam.Averageing: yes +#MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins: 500 +#MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst: -100.5 +#MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast: 1899.5 +MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins: 250 +#MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst: -100.5 +#MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast: 899.5 +#MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit: 1. +#MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit: 3. +#MJCalibrateSignal.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02 +#MJCalibrateSignal.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 +#MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit: 0.0001 +#MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit: 0.005 +MJCalibrateSignal.MHCalibrationChargeCam.PulserFrequency: 50 + +# ------------------------------------------------------------------------- +# Setup relative time interlaced calibration +# ------------------------------------------------------------------------- +#MJCalibrateSignal.MHCalibrationRelTimeCam.Debug: no +#MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain: no +MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations: no +#MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck: yes +#MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing: yes +#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainNbins: 210 +#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainFirst: -5. +#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainLast: 10. +#MJCalibrateSignal.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25 +#MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit: 0.00001 +#MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit: 0.005 +MJCalibrateSignal.MHCalibrationRelTimeCam.PulserFrequency: 50 + +# ------------------------------------------------------------------------- +# This is a special option for the datacheck. A task executed as last +# task in the event processing task list - in the standard software it +# is skipped +# ------------------------------------------------------------------------- +#MJCalibrateSignal.FinalFantasy: MHCamFlorian Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc (revision 6912) +++ trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc (revision 6913) @@ -300,5 +300,4 @@ case 45470: case 45484: - case 45490: case 45493: case 45502: Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 6912) +++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 6913) @@ -520,7 +520,8 @@ if (ubad.IsUncalibrated(MBadPixelsPix::kChargeIsPedestal)) { - *fLog << warn << GetDescriptor() << "Probably calibration pulses have been lost!!!!" << endl; - *fLog << warn << "Will not update calib. factors any more!!!!" << endl; + *fLog << warn << GetDescriptor() << ": Mean charge in inner pixels is smaller than 3 ped. RMS." << endl; + *fLog << "Maybe calibration pulses have been lost!" << endl; calibUpdate = 1.; + } } Index: trunk/MagicSoft/Mars/mjobs/MJCalib.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalib.cc (revision 6912) +++ trunk/MagicSoft/Mars/mjobs/MJCalib.cc (revision 6913) @@ -54,4 +54,7 @@ fRuns(NULL) { + SetUseBlindPixel(kFALSE); + SetUsePINDiode(kFALSE); + SetCheckedPixId(); } Index: trunk/MagicSoft/Mars/mjobs/MJCalib.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalib.h (revision 6912) +++ trunk/MagicSoft/Mars/mjobs/MJCalib.h (revision 6913) @@ -32,4 +32,12 @@ Byte_t fStorage; // Bit-field for chosen storage type + enum Device_t // Possible devices for calibration + { + kUseBlindPixel, + kUsePINDiode + }; + + Byte_t fDevices; // Bit-field for used devices for calibration + protected: @@ -58,4 +66,7 @@ Bool_t IsUseMC() const { return fDataFlag==kIsUseMC; } + Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); } + Bool_t IsUsePINDiode () const { return TESTBIT(fDevices,kUsePINDiode); } + void SetUseRawData () { fDataFlag=kIsUseRawData; } void SetUseRootData() { fDataFlag=kIsUseRootData; } @@ -72,5 +83,8 @@ void SetPixelCheck ( const Bool_t b=kTRUE ) { fIsPixelCheck = b; } void SetPulsePosCheck ( const Bool_t b=kTRUE ) { fIsPulsePosCheck = b; } - + + void SetUseBlindPixel(const Bool_t b=kTRUE) { b ? SETBIT(fDevices,kUseBlindPixel) : CLRBIT(fDevices,kUseBlindPixel); } + void SetUsePINDiode(const Bool_t b=kTRUE) { b ? SETBIT(fDevices,kUsePINDiode) : CLRBIT(fDevices,kUsePINDiode); } + ClassDef(MJCalib, 0) // Base class for calibration jobs }; Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 6912) +++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 6913) @@ -92,4 +92,5 @@ #include "MTriggerPatternDecode.h" #include "MFTriggerPattern.h" +#include "MFTriggerLvl1.h" #include "MGeomApply.h" //#include "MMcPedestalCopy.h" @@ -179,5 +180,5 @@ } -Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext1, MExtractor* &ext2, TString &geom) const +Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext2, MExtractor* &ext3, TString &geom) const { @@ -193,16 +194,13 @@ } - if (!ext1) - { - TObject *o = file.Get("ExtractSignal"); - if (o && !o->InheritsFrom(MExtractor::Class())) - { - *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl; - return kFALSE; - } - ext1 = o ? (MExtractor*)o->Clone() : NULL; - } - - TObject *o = file.Get("ExtractTime"); + TObject *o = file.Get("ExtractSignal"); + if (o && !o->InheritsFrom(MExtractor::Class())) + { + *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl; + return kFALSE; + } + ext3 = o ? (MExtractor*)o->Clone() : NULL; + + o = file.Get("ExtractTime"); if (o && !o->InheritsFrom(MExtractor::Class())) { @@ -211,5 +209,5 @@ } ext2 = o ? (MExtractor*)o->Clone() : NULL; - if (!ext1 && !ext2) + if (!ext3 && !ext2) { *fLog << err << dbginf << "ERROR - Neither ExtractSignal nor ExrtractTime found in " << fname << "!" << endl; @@ -385,5 +383,5 @@ calibcont.Add(&tmcam); - if (!ReadCalibration(calibcont, badpix, extractor1, extractor2, geom)) + if (!ReadCalibration(calibcont, badpix, extractor2, extractor3, geom)) return kFALSE; @@ -394,13 +392,25 @@ *fLog << inf << "No Camera geometry found using default " << endl; + if (extractor3) + { + *fLog << underline << "Signal Extractor found in calibration file" << endl; + extractor3->Print(); + *fLog << endl; + } + else + *fLog << inf << "No Signal Extractor: ExtractSignal in file." << endl; + + if (extractor1) { - *fLog << underline << "Signal Extractor found in calibration file" << endl; + *fLog << underline << "Modified Signal Extractor set by user." << endl; extractor1->Print(); *fLog << endl; - extractor3 = (MExtractor*)extractor1->Clone(); } else - *fLog << inf << "No Signal Extractor: ExtractSignal in file." << endl; + { + *fLog << inf << "No modified Signal Extractor set by user... using ExtractSignal." << endl; + extractor1 = extractor3 ? (MExtractor*)extractor3->Clone() : 0; + } if (extractor2) @@ -455,5 +465,7 @@ // Skips empty MC events (Not necessary, but faster!) - MContinue contmc("MRawEvtData.GetNumPixels<0.5", "ContEmptyMC"); + MFTriggerLvl1 trigmc; + MContinue contmc(&trigmc, "ContTrigMC"); + contmc.SetInverted(); MPointingPosInterpolate pextr; @@ -718,7 +730,9 @@ pacalc.SetFilter(&fcalib); filcam.SetFilter(&fcalib); - filtme.SetFilter(&fcalib); - filbnd.SetFilter(&fcalib); - filpin.SetFilter(&fcalib); + filtme.SetFilter(&fcalib); + if (IsUseBlindPixel()) + filbnd.SetFilter(&fcalib); + if (IsUsePINDiode()) + filpin.SetFilter(&fcalib); chcalc.SetFilter(&fcalib); recalc.SetFilter(&fcalib); @@ -775,6 +789,8 @@ tlist.AddToList(read); if (IsUseMC()) + { tlist.AddToList(&writemc); - tlist.AddToList(&contmc); + tlist.AddToList(&contmc); + } if (IsUseRootData()) Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 6912) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 6913) @@ -198,7 +198,4 @@ fName = name ? name : "MJCalibration"; fTitle = title ? title : "Tool to create the calibration constants for one calibration run"; - - SetUseBlindPixel(kFALSE); - SetUsePINDiode(kFALSE); SetHiLoCalibration(); @@ -2105,23 +2102,4 @@ } - -// -------------------------------------------------------------------------- -// -// Set the useage of the Blind Pixel device -// -void MJCalibration::SetUseBlindPixel(const Bool_t b) -{ - b ? SETBIT(fDevices,kUseBlindPixel) : CLRBIT(fDevices,kUseBlindPixel); -} - -// -------------------------------------------------------------------------- -// -// Set the useage of the PIN Diode device -// -void MJCalibration::SetUsePINDiode(const Bool_t b) -{ - b ? SETBIT(fDevices,kUsePINDiode) : CLRBIT(fDevices,kUsePINDiode); -} - /* Bool_t MJCalibration::WriteEventloop(MEvtLoop &evtloop) const Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 6912) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 6913) @@ -125,12 +125,4 @@ Display_t fDisplayType; // Chosen Display type - enum Device_t // Possible devices for calibration - { - kUseBlindPixel, - kUsePINDiode - }; - - Byte_t fDevices; // Bit-field for used devices for calibration - enum { kRelTimes, kDebug, kIntensity }; // Possible flags @@ -139,7 +131,4 @@ TString fGeometry; // Class name geometry - Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); } - Bool_t IsUsePINDiode () const { return TESTBIT(fDevices,kUsePINDiode); } - Bool_t IsRelTimes () const { return TESTBIT(fFlags,kRelTimes); } Bool_t IsDebug () const { return TESTBIT(fFlags,kDebug); } @@ -205,8 +194,4 @@ void SetIntensity ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); } - // Devices - void SetUseBlindPixel(const Bool_t b=kTRUE); - void SetUsePINDiode(const Bool_t b=kTRUE); - // Files void SetReferenceFile( const TString ref=fgReferenceFile ) { fReferenceFile = ref; } Index: trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc =================================================================== --- trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc (revision 6913) +++ trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc (revision 6913) @@ -0,0 +1,76 @@ +# +# Reference lines for the data check, valid from for data +# from Nov. 04 on +# +###################################################################### +###################################################################### +# +# Histogram Limits: +# +###################################################################### +# +# Converstion factors: +# +ConvFADC2PheMin: 0. +ConvFADC2PheMax: 1.8 +ConvFADC2PhotMin: 0. +ConvFADC2PhotMax: 15. +# +# Quantum Efficiencies: +# +QEMin: -0.05 +QEMax: 3. +# +# Relative Time Calibration: +# +TimeOffsetMin: -3. +TimeOffsetMax: 3. +TimeResolutionMin: 0. +TimeResolutionMax: 1. +# +# Arrival Times from Max. bin: +# +ArrivalTimeMin: 1. +ArrivalTimeMax: 10. +###################################################################### +###################################################################### +# +# Reference Lines: +# +###################################################################### +# +# Converstion factors: +# +RefConvFADC2PheInner: 0.3 +RefConvFADC2PheOuter: 0.6 +RefConvFADC2PhotInner: 1.7 +RefConvFADC2PhotOuter: 6.55 +# +# Quantum Efficiencies: +# +RefQEInner: 0.18 +RefQEOuter: 0.12 +# +# Arrival Times from Max. bin: +# +RefArrivalTimeInner: 5.4 +RefArrivalTimeOuter: 6.0 +RefArrivalTimeRmsInner: 0.58. +RefArrivalTimeRmsOuter: 0.57. +# +# Relative Time Calibration: +# +RefTimeOffsetInner: -0.23 +RefTimeOffsetOuter: 0.39 +RefTimeResolutionInner: 0.153 +RefTimeResolutionOuter: 0.128 +# +# Mean Absolute Time: +# +InnerRefCharge: 115. +OuterRefCharge: 110. +# +# Mean Absolute Charge: +# +InnerRefTime: 4.5 +OuterRefTime: 5.0 Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (revision 6912) +++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (revision 6913) @@ -175,4 +175,5 @@ const TString MExtractPedestal::fgNamePedestalCam = "MPedestalCam"; +const UInt_t MExtractPedestal::fgNumDump = 500; // -------------------------------------------------------------------------- @@ -474,4 +475,18 @@ Bool_t rc=kFALSE; + // find resource for numdump + if (IsEnvDefined(env, prefix, "NumDump", print)) + { + const Int_t num = GetEnvValue(env, prefix, "NumDump", -1); + if (num<=0) + { + *fLog << err << GetDescriptor() << ": ERROR - NumDump invalid!" << endl; + return kERROR; + } + + SetNumDump(num); + rc = kTRUE; + } + // find resource for numeventsdump if (IsEnvDefined(env, prefix, "NumEventsDump", print)) Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h (revision 6912) +++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h (revision 6913) @@ -25,4 +25,5 @@ private: static const TString fgNamePedestalCam; //! "MPedestalCam" + static const UInt_t fgNumDump; //! TString fNamePedestalCamIn; // Name of the incoming 'MPedestalCam' container @@ -96,8 +97,8 @@ Bool_t SetExtractWindow(UShort_t first, UShort_t size); - void SetNumEventsDump (UInt_t dumpevents=500) { fNumEventsDump = dumpevents; } - void SetNumAreasDump (UInt_t dumpevents=500) { fNumAreasDump = dumpevents; } - void SetNumSectorsDump(UInt_t dumpevents=500) { fNumSectorsDump = dumpevents; } - void SetNumDump (UInt_t n=500) { fNumEventsDump=n; fNumAreasDump=n; fNumSectorsDump=n; } + void SetNumEventsDump (UInt_t dumpevents=fgNumDump) { fNumEventsDump = dumpevents; } + void SetNumAreasDump (UInt_t dumpevents=fgNumDump) { fNumAreasDump = dumpevents; } + void SetNumSectorsDump(UInt_t dumpevents=fgNumDump) { fNumSectorsDump = dumpevents; } + void SetNumDump (UInt_t n=fgNumDump) { fNumEventsDump=n; fNumAreasDump=n; fNumSectorsDump=n; } // names Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc (revision 6912) +++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc (revision 6913) @@ -80,5 +80,6 @@ const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile = "msignal/cosmics_weights.dat"; const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain = 1.7; // 5 ns -const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift = -1.8; +const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift = -2.8; + // -------------------------------------------------------------------------- // Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc (revision 6912) +++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc (revision 6913) @@ -150,5 +150,5 @@ using namespace std; -const Byte_t MExtractTimeAndChargeSpline::fgHiGainFirst = 2; +const Byte_t MExtractTimeAndChargeSpline::fgHiGainFirst = 0; const Byte_t MExtractTimeAndChargeSpline::fgHiGainLast = 14; const Byte_t MExtractTimeAndChargeSpline::fgLoGainFirst = 1;