Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 2037) +++ /trunk/MagicSoft/Mars/Changelog (revision 2038) @@ -14,4 +14,10 @@ - fixed MHillas, MHillasExt and MNewImagePar stuff + * manalysis/MImgCleanStd.[h,cc]: + - added Nadia to the list of authors + + * manalysis/MCT1SupercutsCalc.[h,cc]: + - changed the default "MHillasExt" to "MHillas" + @@ -36,8 +42,7 @@ * mimage/MImgCleanStd.[h,cc] - - added the option kDemocratic using sigmabar of the - inner pixels + - added the option kDemocratic using sigmabar of the inner pixels - added the option to select the number of rings of pixels - to analyze around the core pixels + to analyze around the core pixels - added documentation Index: /trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc (revision 2037) +++ /trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc (revision 2038) @@ -152,5 +152,5 @@ if (!fHil) { - *fLog << err << fHilName << " [MHillasExt] not found... aborting." << endl; + *fLog << err << fHilName << " [MHillas] not found... aborting." << endl; return kFALSE; } Index: /trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h (revision 2037) +++ /trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h (revision 2038) @@ -54,7 +54,7 @@ public: - MCT1SupercutsCalc(const char *hilname="MHillasExt", - const char *hilsrcname="MHillasSrc", - const char *name=NULL, const char *title=NULL); + MCT1SupercutsCalc(const char *hilname="MHillas", + const char *hilsrcname="MHillasSrc", + const char *name=NULL, const char *title=NULL); Double_t CtsMCut(Double_t *a, Double_t ls, Double_t ct, Index: /trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc (revision 2037) +++ /trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc (revision 2038) @@ -16,8 +16,9 @@ ! ! -! Author(s): Thomas Bretz 12/2000 -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) +! Author(s): Thomas Bretz, 12/2000 +! Author(s): Harald Kornmayer, 1/2001 +! Author(s): Nadia Tonello, 4/2003 ! -! Copyright: MAGIC Software Development, 2000-2002 +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -25,227 +26,225 @@ ///////////////////////////////////////////////////////////////////////////// -// // -// MImgCleanStd // -// // -// The Image Cleaning task selects the pixels you use for the Hillas // -// parameters calculation. // -// // -// There are two methods to make the selection: the standard one, as done // -// in the analysis of CT1 data, and the democratic one, as suggested by // -// W.Wittek. The number of photo-electrons of a pixel is compared with the // -// pedestal RMS of the pixel itself (standard method) or with the average // -// RMS of the inner pixels (democratic method). // -// In both cases, the possibility to have a camera with pixels of // -// different area is taken into account. // -// The too noisy pixels can be recognized and eventally switched off // -// (Unmap: set blinb pixels to UNUSED) separately, using the // -// MBlindPixelCalc Class. In the MBlindPixelCalc class there is also the // -// function to replace the value of the noisy pixels with the interpolation// -// of the content of the neighbors (SetUseInterpolation). // -// // -// Example: // -// ... // -// MBlindPixelCalc blind; // -// blind.SetUseInterpolation(); // -// blind.SetUseBlindPixels(); // -// // -// MImgCleanStd clean; // -// ... // -// tlist.AddToList(&blind); // -// tlist.AddToList(&clean); // -// // -// Look at the MBlindPixelCalc Class for more details. // -// // -// Starting point: default values ---------------------------------------- // -// // -// When an event is read, before the image cleaning, all the pixels that // -// are in MCerPhotEvt are set as USED and NOT CORE. All the pixels belong // -// to RING number 1 (like USED pixels). // -// Look at MCerPhotPix.h to see how these informations of the pixel are // -// stored. // -// The default cleaning METHOD is the STANDARD one and the number of the // -// rings around the CORE pixel it analyzes is 1. Look at the Constructor // -// of the class in MImgCleanStd.cc to see (or change) the default values. // -// // -// Example: To modify this setting, use the member functions // -// SetMethod(MImgCleanStd::kDemocratic) and SetCleanRings(UShort_t n). // -// // -// MImgCleanStd:CleanStep1 -------------------------------------------- ---// -// // -// The first step of cleaning defines the CORE pixels. The CORE pixels are // -// the ones which contain the informations about the core of the electro- // -// magnetic shower. // -// The ratio (A_0/A_i) is calculated from fCam->GetPixRatio(i). A_0 is // -// the area of the central pixel of the camera, A_i is the area of the // -// examined pixel. In this way, if we have a MAGIC-like camera, with the // -// outer pixels bigger than the inner ones, the level of cleaning in the // -// two different regions is weighted. // -// This avoids problems of deformations of the shower images. // -// The signal S_i and the pedestal RMS Prms_i of the pixel are called from // -// the object MCerPhotPix. // -// If (default method = kStandard) // -// // -// S_i > L_1 * Prms_i / sqrt(A_0/A_i) // -// // -// the pixel is set as CORE pixel. L_1 is called "first level of cleaning" // -// (default: fCleanLvl1 = 3). // -// All the other pixels are set as UNUSED and belong to RING 0. // -// After this point, only the CORE pixels are set as USED, with RING // -// number 1. // -// // -// MImgCleanStd:CleanStep2 ---------------------------------------------- // -// // -// The second step of cleaning looks at the isolated CORE pixels and sets // -// them to UNUSED. An isolated pixel is a pixel without CORE neighbors. // -// At the end of this point, we have set as USED only CORE pixels with at // -// least one CORE neighbor. // -// // -// MImgCleanStd:CleanStep3 ---------------------------------------------- // -// // -// The third step of cleaning looks at all the pixels (USED or UNUSED) that// -// surround the USED pixels. // -// If the content of the analyzed pixel survives at the second level of // -// cleaning, i.e. if // -// // -// S_i > L_2 * Prms_i / sqrt(A_0/A_i) // -// // -// the pixel is set as USED. L_2 is called "second level of cleaning" // -// (default:fCleanLvl2 = 2.5). // -// // -// When the number of RINGS to analyze is 1 (default value), only the // -// pixels that have a neighbor CORE pixel are analyzed. // -// // -// There is the option to decide the number of times you want to repeat // -// this procedure (number of RINGS analyzed around the core pixels = n). // -// Every time the level of cleaning is the same (fCleanLvl2) and the pixel // -// will belong to ring r+1, 1 < r < n+1. This is described in // -// MImgCleanStd:CleanStep4 . // -// // -// Dictionary and member functions --------------------------------------- // -// // -// Here there is the detailed description of the member functions and of // -// the terms commonly used in the class. // -// // -// STANDARD CLEANING: // -// ================= // -// This is the method used for the CT1 data analysis. It is the default // -// method of the class. // -// The number of photo-electrons of a pixel (S_i) is compared to the // -// pedestal RMS of the pixel itself (Prms_i). To have the comparison to // -// the same photon density for all the pixels, taking into account they // -// can have different areas, we have to keep in mind that the number of // -// photons that hit each pixel, goes linearly with the area of the pixel. // -// The fluctuations of the LONS are proportional to sqrt(A_i), so when we // -// compare S_i with Prms_i, only a factor sqrt(A_0/A_i) is missing to // -// have the same (N.photons/Area) threshold for all the pixels. // -// // -// !!WARNING: if noise independent from the // -// pixel size is considered, // -// this weight can give wrong results!! // -// If // -// // -// S_i > L_n * Prms_i / sqrt(A_0/A_i) // -// // -// the pixel survives the cleaning and it is set as CORE (when L_n is the // -// first level of cleaning, fCleanLvl1) or USED ((when L_n is the second // -// level of cleaning, fCleanLvl2). // -// // -// Example: // -// // -// MImgCleanStd clean; // -// //creates a default Cleaning object, with default setting // -// ... // -// tlist.AddToList(&clean); // -// // add the image cleaning to the main task list // -// // -// DEMOCRATIC CLEANING: // -// =================== // -// You use this cleaning method when you want to compare the number of // -// photo-electons of each pixel with the average pedestal RMS // -// (fInnerNoise = fSgb->GetSigmabarInner()) of the inner pixels (for the // -// MAGIC camera they are the smaller ones): // -// // -// S_i > L_n * fInnerNoise / (A_0/A_i) // -// // -// In this case, the simple ratio (A_0/A_i) is used to weight the level of // -// cleaning, because both the inner and the outer pixels (that in MAGIC // -// have a different area) are compared to the same pedestal RMS, coming // -// from the inner pixels. // -// To calculate the average pedestal RMS of the inner pixels, you have to // -// add to the main task list an object of type MSigmabarCalc before the // -// MImgCleanStd object. To know how the calculation of fInnerNoise is done // -// look at the MSigmabarCalc Class. // -// // -// Example: // -// // -// MSigmabarCalc sbcalc; // -// //creates an object that calcutates the average pedestal RMS // -// MImgCleanStd clean; // -// ... // -// tlist.AddToList(&sbcalc); // -// tlist.AddToList(&clean); // -// // -// Member Function: SetMethod() // -// ============================ // -// When you call the MImgCleanStd task, the default method is kStandard. // -// // -// If you want to switch to the kDemocratic method you have to // -// call this member function. // -// // -// Example: // -// // -// MImgCleanStd clean; // -// //creates a default Cleaning object, with default setting // -// // -// clean.SetMethod(MImgCleanStd::kDemocratic); // -// //now the method of cleaning is changed to Democratic // -// // -// FIRST AND SECOND CLEANING LEVEL // -// =============================== // -// When you call the MImgCleanStd task, the default cleaning levels are // -// fCleanLvl1 = 3, fCleanLvl2 = 2.5. You can change them easily when you // -// create the MImgCleanStd object. // -// // -// Example: // -// // -// MImgCleanStd clean(Float_t lvl1,Float_t lvl2); // -// //creates a default cleaning object, but the cleaning levels are now // -// //lvl1 and lvl2. // -// // -// RING NUMBER // -// =========== // -// The standard cleaning procedure is such that it looks for the // -// informations of the boundary part of the shower only on the first // -// neighbors of the CORE pixels. // -// There is the possibility now to look not only at the firs neighbors // -// (first ring),but also further away, around the CORE pixels. All the new // -// pixels you can find with this method, are tested with the second level // -// of cleaning and have to have at least an USED neighbor. // -// // -// They will be also set as USED and will be taken into account during the // -// calculation of the image parameters. // -// The only way to distinguish them from the other USED pixels, is the // -// Ring number, that is bigger than 1. // -// // -// Example: You can decide how many rings you want to analyze using: // -// // -// MImgCleanStd clean; // -// //creates a default cleaning object (default number of rings =1) // -// clean.SetCleanRings(UShort\_t r); // -// //now it looks r times around the CORE pixels to find new pixels with // -// //signal. // -// // -// // -// FIXME: MImgCleanStd is not yet completely optimized for speed. // -// Maybe we don't have to loop over all pixels all the time... // -// // -// Input Containers: // -// MGeomCam, MCerPhotEvt, MSigmabar // -// // -// Output Containers: // -// -/- // -// // -////////////////////////////////////////////////////////////////////////// // -#include "MImgCleanStd.h" +// +// MImgCleanStd +// +// The Image Cleaning task selects the pixels you use for the Hillas +// parameters calculation. +// +// There are two methods to make the selection: the standard one, as done +// in the analysis of CT1 data, and the democratic one, as suggested by +// W.Wittek. The number of photo-electrons of a pixel is compared with the +// pedestal RMS of the pixel itself (standard method) or with the average +// RMS of the inner pixels (democratic method). +// In both cases, the possibility to have a camera with pixels of +// different area is taken into account. +// The too noisy pixels can be recognized and eventally switched off +// (Unmap: set blind pixels to UNUSED) separately, using the +// MBlindPixelCalc Class. In the MBlindPixelCalc class there is also the +// function to replace the value of the noisy pixels with the interpolation +// of the content of the neighbors (SetUseInterpolation). +// +// Example: +// ... +// MBlindPixelCalc blind; +// blind.SetUseInterpolation(); +// blind.SetUseBlindPixels(); +// +// MImgCleanStd clean; +// ... +// tlist.AddToList(&blind); +// tlist.AddToList(&clean); +// +// Look at the MBlindPixelCalc Class for more details. +// +// Starting point: default values ---------------------------------------- +// +// When an event is read, before the image cleaning, all the pixels that +// are in MCerPhotEvt are set as USED and NOT CORE. All the pixels belong +// to RING number 1 (like USED pixels). +// Look at MCerPhotPix.h to see how these informations of the pixel are +// stored. +// The default cleaning METHOD is the STANDARD one and the number of the +// rings around the CORE pixel it analyzes is 1. Look at the Constructor +// of the class in MImgCleanStd.cc to see (or change) the default values. +// +// Example: To modify this setting, use the member functions +// SetMethod(MImgCleanStd::kDemocratic) and SetCleanRings(UShort_t n). +// +// MImgCleanStd:CleanStep1 -------------------------------------------- --- +// +// The first step of cleaning defines the CORE pixels. The CORE pixels are +// the ones which contain the informations about the core of the electro- +// magnetic shower. +// The ratio (A_0/A_i) is calculated from fCam->GetPixRatio(i). A_0 is +// the area of the central pixel of the camera, A_i is the area of the +// examined pixel. In this way, if we have a MAGIC-like camera, with the +// outer pixels bigger than the inner ones, the level of cleaning in the +// two different regions is weighted. +// This avoids problems of deformations of the shower images. +// The signal S_i and the pedestal RMS Prms_i of the pixel are called from +// the object MCerPhotPix. +// If (default method = kStandard) +// +// S_i > L_1 * Prms_i / sqrt(A_0/A_i) +// +// the pixel is set as CORE pixel. L_1 is called "first level of cleaning" +// (default: fCleanLvl1 = 3). +// All the other pixels are set as UNUSED and belong to RING 0. +// After this point, only the CORE pixels are set as USED, with RING +// number 1. +// +// MImgCleanStd:CleanStep2 ---------------------------------------------- +// +// The second step of cleaning looks at the isolated CORE pixels and sets +// them to UNUSED. An isolated pixel is a pixel without CORE neighbors. +// At the end of this point, we have set as USED only CORE pixels with at +// least one CORE neighbor. +// +// MImgCleanStd:CleanStep3 ---------------------------------------------- +// +// The third step of cleaning looks at all the pixels (USED or UNUSED) that +// surround the USED pixels. +// If the content of the analyzed pixel survives at the second level of +// cleaning, i.e. if +// +// S_i > L_2 * Prms_i / sqrt(A_0/A_i) +// +// the pixel is set as USED. L_2 is called "second level of cleaning" +// (default:fCleanLvl2 = 2.5). +// +// When the number of RINGS to analyze is 1 (default value), only the +// pixels that have a neighbor CORE pixel are analyzed. +// +// There is the option to decide the number of times you want to repeat +// this procedure (number of RINGS analyzed around the core pixels = n). +// Every time the level of cleaning is the same (fCleanLvl2) and the pixel +// will belong to ring r+1, 1 < r < n+1. This is described in +// MImgCleanStd:CleanStep4 . +// +// Dictionary and member functions --------------------------------------- +// +// Here there is the detailed description of the member functions and of +// the terms commonly used in the class. +// +// STANDARD CLEANING: +// ================= +// This is the method used for the CT1 data analysis. It is the default +// method of the class. +// The number of photo-electrons of a pixel (S_i) is compared to the +// pedestal RMS of the pixel itself (Prms_i). To have the comparison to +// the same photon density for all the pixels, taking into account they +// can have different areas, we have to keep in mind that the number of +// photons that hit each pixel, goes linearly with the area of the pixel. +// The fluctuations of the LONS are proportional to sqrt(A_i), so when we +// compare S_i with Prms_i, only a factor sqrt(A_0/A_i) is missing to +// have the same (N.photons/Area) threshold for all the pixels. +// +// !!WARNING: if noise independent from the +// pixel size is considered, +// this weight can give wrong results!! +// If +// +// S_i > L_n * Prms_i / sqrt(A_0/A_i) +// +// the pixel survives the cleaning and it is set as CORE (when L_n is the +// first level of cleaning, fCleanLvl1) or USED ((when L_n is the second +// level of cleaning, fCleanLvl2). +// +// Example: +// +// MImgCleanStd clean; +// //creates a default Cleaning object, with default setting +// ... +// tlist.AddToList(&clean); +// // add the image cleaning to the main task list +// +// DEMOCRATIC CLEANING: +// =================== +// You use this cleaning method when you want to compare the number of +// photo-electons of each pixel with the average pedestal RMS +// (fInnerNoise = fSgb->GetSigmabarInner()) of the inner pixels (for the +// MAGIC camera they are the smaller ones): +// +// S_i > L_n * fInnerNoise / (A_0/A_i) +// +// In this case, the simple ratio (A_0/A_i) is used to weight the level of +// cleaning, because both the inner and the outer pixels (that in MAGIC +// have a different area) are compared to the same pedestal RMS, coming +// from the inner pixels. +// To calculate the average pedestal RMS of the inner pixels, you have to +// add to the main task list an object of type MSigmabarCalc before the +// MImgCleanStd object. To know how the calculation of fInnerNoise is done +// look at the MSigmabarCalc Class. +// +// Example: +// +// MSigmabarCalc sbcalc; +// //creates an object that calcutates the average pedestal RMS +// MImgCleanStd clean; +// ... +// tlist.AddToList(&sbcalc); +// tlist.AddToList(&clean); +// +// Member Function: SetMethod() +// ============================ +// When you call the MImgCleanStd task, the default method is kStandard. +// +// If you want to switch to the kDemocratic method you have to +// call this member function. +// +// Example: +// +// MImgCleanStd clean; +// //creates a default Cleaning object, with default setting +// +// clean.SetMethod(MImgCleanStd::kDemocratic); +// //now the method of cleaning is changed to Democratic +// +// FIRST AND SECOND CLEANING LEVEL +// =============================== +// When you call the MImgCleanStd task, the default cleaning levels are +// fCleanLvl1 = 3, fCleanLvl2 = 2.5. You can change them easily when you +// create the MImgCleanStd object. +// +// Example: +// +// MImgCleanStd clean(Float_t lvl1,Float_t lvl2); +// //creates a default cleaning object, but the cleaning levels are now +// //lvl1 and lvl2. +// +// RING NUMBER +// =========== +// The standard cleaning procedure is such that it looks for the +// informations of the boundary part of the shower only on the first +// neighbors of the CORE pixels. +// There is the possibility now to look not only at the firs neighbors +// (first ring),but also further away, around the CORE pixels. All the new +// pixels you can find with this method, are tested with the second level +// of cleaning and have to have at least an USED neighbor. +// +// They will be also set as USED and will be taken into account during the +// calculation of the image parameters. +// The only way to distinguish them from the other USED pixels, is the +// Ring number, that is bigger than 1. +// +// Example: You can decide how many rings you want to analyze using: +// +// MImgCleanStd clean; +// //creates a default cleaning object (default number of rings =1) +// clean.SetCleanRings(UShort_t r); +// //now it looks r times around the CORE pixels to find new pixels with +// //signal. +// +// +// Input Containers: +// MGeomCam, MCerPhotEvt, MSigmabar +// +// Output Containers: +// MCerPhotEvt +// +///////////////////////////////////////////////////////////////////////////// +#include "MImgCleanStd.h" + #include // atof #include // ofstream, SavePrimitive @@ -373,6 +372,5 @@ const Double_t ratio = fCam->GetPixRatio(id); - // COBB: '<=' to skip entry=noise=0 - + // COBB: '<=' to skip entry=noise=0 if (entry <= fCleanLvl1 * fInnerNoise / ratio) pix.SetPixelUnused(); @@ -433,18 +431,14 @@ { // get entry i from list - // MCerPhotPix &pix = (*fEvt)[i]; // get pixel id of this entry - // const Int_t id = pix.GetPixId(); // check if pixel is in use, if not goto next pixel in list - // if (ispixused[id] == 0) continue; // check for 'used' neighbors of this pixel - // const MGeomPix &gpix = (*fCam)[id]; const Int_t nnmax = gpix.GetNumNeighbors(); @@ -453,5 +447,4 @@ //loop on the neighbors to check if they are used - // for (Int_t j=0; j