Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8652) +++ /trunk/MagicSoft/Mars/Changelog (revision 8653) @@ -25,4 +25,7 @@ - removed conc1-spark cut - changed cut coefficients to new algorithm + + * mars.rc, star.rc: + - switched to use new image cleaning Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 8652) +++ /trunk/MagicSoft/Mars/NEWS (revision 8653) @@ -58,4 +58,47 @@ - mars: There are two new heckboxes which allow to switch off the calculated image parameters + + - callisto: was broken for MCs... fixed. + + - callisto: improved calculation of spline coefficients a lot. This + leads to a further improvement of the event rate calibrating MUX + data of about 15% (175evt/s instead of 150evt/s) + + - callisto: finally the raw data we read is now real 16bit (with + 10bit precision) for MUX data and not a stripped 8bit number + anymore. Due to scaling of the numbers (without precision loss + into an [0-256[ range, the final numbers for pedestal, pedestalrms + and extacted signal don't change. However, at all places where + raw data is directly accessed (eg. saturation and variation + limits in the signal- and pedestal-extraction) the numbers + refer still to the data's 16bit range. + + - callisto: The maximum arrival time difference used in the bad + pixel treatment is now in units of nanoseconds, which leads to 3.0ns + for both, old FADC and MUX-FADC, data. + + - callisto: Be aware that callisto is now calibrating the arrival time + in nanoseconds rather than time slices. Also all following tasks + have been changed to assume ns units now. If you star data + calibrated with an older version it might be necessary to adapt + some timimng parameters (Muon Analysis and MFSoftwareTrigger) + to obtain optimal results. The plot in the PulsePos tab + will now be in ns, too. This might also mean that the Muon + analysis in star might not work as perfect as expected as long + as old files read in. + + - star: For speed reasons events suitable for the muon analysis + are now also preselected by fConcCOG<0.1 which seems to be a very + good preselector for muons. + + - star: is now calculating a new timing parameter the Slope along + the major and minor axis of the shower. Therefore a numerical + solution of a line-fit is used. To use MHillasExt.fSlopeLong + and MHillasExt.fSlopeTrans don't forget to multiply it with + the sign stored in MHillasSrc.fCosDeltaAlpha as usual. + + - star: The parameters fInnerSize, fInnerLeakage1 and fInnerLeakage2 + have been removed from MNewImagePar. They have never been good for + anything. - star: Implemented a new recursive algorithm which is supposed to be @@ -89,46 +132,4 @@ + PostCleanType: 3 - - callisto: was broken for MCs... fixed. - - - callisto: improved calculation of spline coefficients a lot. This - leads to a further improvement of the event rate calibrating MUX - data of about 15% (175evt/s instead of 150evt/s) - - - callisto: finally the raw data we read is now real 16bit (with - 10bit precision) for MUX data and not a stripped 8bit number - anymore. Due to scaling of the numbers (without precision loss - into an [0-256[ range, the final numbers for pedestal, pedestalrms - and extacted signal don't change. However, at all places where - raw data is directly accessed (eg. saturation and variation - limits in the signal- and pedestal-extraction) the numbers - refer still to the data's 16bit range. - - - callisto: The maximum arrival time difference used in the bad - pixel treatment is now in units of nanoseconds, which leads to 3.0ns - for both, old FADC and MUX-FADC, data. - - - callisto: Be aware that callisto is now calibrating the arrival time - in nanoseconds rather than time slices. Also all following tasks - have been changed to assume ns units now. If you star data - calibrated with an older version it might be necessary to adapt - some timimng parameters (Muon Analysis and MFSoftwareTrigger) - to obtain optimal results. The plot in the PulsePos tab - will now be in ns, too. This might also mean that the Muon - analysis in star might not work as perfect as expected as long - as old files read in. - - - star: For speed reasons events suitable for the muon analysis - are now also preselected by fConcCOG<0.1 which seems to be a very - good preselector for muons. - - - star: is now calculating a new timing parameter the Slope along - the major and minor axis of the shower. Therefore a numerical - solution of a line-fit is used. To use MHillasExt.fSlopeLong - and MHillasExt.fSlopeTrans don't forget to multiply it with - the sign stored in MHillasSrc.fCosDeltaAlpha as usual. - - - star: The parameters fInnerSize, fInnerLeakage1 and fInnerLeakage2 - have been removed from MNewImagePar. They have never been good for - anything. - ganymed: The old hadronness and size cuts have gotten new indices @@ -169,7 +170,4 @@ "nearest position" trick) - - ganymed: From XXXX on a real starguider calibration with a real - pointing model for the starguider is done. - - ganymed: From 85340 (19.3.2006) on a real starguider calibration with a real pointing model for the starguider is done, calibrated @@ -186,4 +184,13 @@ the Area-Cut (parameters 2,3,4) and the theta-sq cut (parameter 1) should be optimized. All other values should be kept as they are. + If you want to do an anylsis without timing a parameters, you can + switch off the timing cuts by seeting parameter 7 to a very small + value (eg. -99). To remove the slope parameter from the disp + paremtrization set parameter 8 to 0. + + - ganymed: IMPORTANT - The spark cuts have been removed from the + resource files because there is currently no proper known + cut. Whenever you do an analysis you have to find proper cuts + yourself! - optim, sponde: should now properly support three off-regions. Index: /trunk/MagicSoft/Mars/star.rc =================================================================== --- /trunk/MagicSoft/Mars/star.rc (revision 8652) +++ /trunk/MagicSoft/Mars/star.rc (revision 8653) @@ -46,9 +46,15 @@ # Setup the image cleaning here # ------------------------------------------------------------------------- -MImgCleanStd.CleanLevel1: 8.5 -MImgCleanStd.CleanLevel2: 4.0 -MImgCleanStd.CleanMethod: Absolute -#MImgCleanStd.CleanRings: 1 -#MImgCleanStd.KeepSinglePixels: No +MImgCleanStd.CleanMethod: absolute +#MImgCleanStd.CleanLevel0: 6.0 +MImgCleanStd.CleanLevel1: 6.0 +MImgCleanStd.CleanLevel2: 3.0 +MImgCleanStd.TimeLevel1: 1.75 +MImgCleanStd.TimeLevel2: 1.75 +MImgCleanStd.PostCleanType: 3 + +#MImgCleanStd.CleanRings: 3 +#MImgCleanStd.KeepIsolatedPixels: Yes +#MImgCleanStd.RecoverIsolatedPixles: Yes # -------------------------------------------------------------------------