Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 4189) +++ trunk/MagicSoft/Mars/Changelog (revision 4190) @@ -30,4 +30,12 @@ * mjobs/MJExtractCalibTest.[h,cc] - don't derive from MGCamDisplays any more. + + + * msignal/MExtractBlindPixel.cc + - adjusted some default numbers for the current blind pixel + + * msignal/MExtractedSignalBlindPixel.[h,cc] + - set extracted signal from UInt_t to Int_t (sometimes, less than + 0) Index: trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h (revision 4189) +++ trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h (revision 4190) @@ -10,5 +10,3 @@ #pragma link C++ class MJExtractCalibTest+; -#pragma link C++ class MGCamDisplays+; - #endif Index: trunk/MagicSoft/Mars/mjobs/MGCamDisplays.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MGCamDisplays.cc (revision 4189) +++ (revision ) @@ -1,112 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Thomas Bretz, 1/2004 -! Markus Gaug, 02/2004 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ -///////////////////////////////////////////////////////////////////////////// -// -// MGCamDisplays -// -// Graphical interfaces to display the camera with fits and projections -// -///////////////////////////////////////////////////////////////////////////// -#include "MGCamDisplays.h" - -#include -#include - -#include "MH.h" -#include "MHCamera.h" -#include "MGeomCam.h" -#include "TVirtualPad.h" - -#include "MLog.h" -#include "MLogManip.h" - -#include "MStatusDisplay.h" - -ClassImp(MGCamDisplays); - -using namespace std; - -// -------------------------------------------------------------------------- -// -// Default constructor. -// -MGCamDisplays::MGCamDisplays() -{ -} - -// -------------------------------------------------------------------------- -// -// Draw the MHCamera into the MStatusDisplay: -// -// 1) Draw it as histogram (MHCamera::DrawCopy("hist") -// 2) Draw it as a camera, with MHCamera::SetPrettyPalette() set. -// 3) If "rad" is not zero, draw its values vs. the radius from the camera center. -// (DrawRadialProfile()) -// 4) Depending on the variable "fit", draw the values projection on the y-axis -// (DrawProjection()): -// 0: don't draw -// 1: Draw fit to Single Gauss (for distributions flat-fielded over the whole camera) -// 2: Draw and fit to Double Gauss (for distributions different for inner and outer pixels) -// 3: Draw and fit to Triple Gauss (for distributions with inner, outer pixels and outliers) -// 4: Draw and fit to Polynomial grade 0: (for the probability distributions) -// >4: Draw and don;t fit. -// -void MGCamDisplays::CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1, - const Int_t fit, const Int_t rad, TObject *notify) -{ - - c.cd(x); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj1=(MHCamera*)cam1.DrawCopy("hist"); - obj1->SetDirectory(NULL); - - if (notify) - obj1->AddNotify(notify); - - c.cd(x+y); - gPad->SetBorderMode(0); - obj1->SetPrettyPalette(); - obj1->Draw(); - - if (rad) - { - c.cd(x+2*y); - gPad->SetBorderMode(0); - gPad->SetTicks(); - obj1->DrawRadialProfile(); - } - - - if (!fit) - return; - - c.cd(rad ? x+3*y : x+2*y); - gPad->SetBorderMode(0); - gPad->SetTicks(); - obj1->DrawProjection(fit); -} - - Index: trunk/MagicSoft/Mars/mjobs/Makefile =================================================================== --- trunk/MagicSoft/Mars/mjobs/Makefile (revision 4189) +++ trunk/MagicSoft/Mars/mjobs/Makefile (revision 4190) @@ -28,6 +28,5 @@ MJCalibration.cc \ MJExtractSignal.cc \ - MJExtractCalibTest.cc \ - MGCamDisplays.cc + MJExtractCalibTest.cc ############################################################ Index: trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (revision 4189) +++ trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (revision 4190) @@ -63,9 +63,9 @@ const Int_t MExtractBlindPixel::fgBlindPixelIdx = 559; -const Int_t MExtractBlindPixel::fgNSBFilterLimit = 800; -const Byte_t MExtractBlindPixel::fgHiGainFirst = 12; +const Int_t MExtractBlindPixel::fgNSBFilterLimit = 100; +const Byte_t MExtractBlindPixel::fgHiGainFirst = 10; const Byte_t MExtractBlindPixel::fgHiGainLast = 29; const Byte_t MExtractBlindPixel::fgLoGainFirst = 0; -const Byte_t MExtractBlindPixel::fgLoGainLast = 10; +const Byte_t MExtractBlindPixel::fgLoGainLast = 7; // -------------------------------------------------------------------------- // @@ -168,4 +168,5 @@ if (fHiLoLast == 0) return; + end = logain + fHiLoLast; @@ -173,5 +174,5 @@ { sum += *logain; - + if (*logain++ >= fSaturationLimit) sat++; @@ -233,5 +234,5 @@ sat = 0; - FindSignalHiGain(pixel.GetHiGainSamples()+fLoGainFirst, pixel.GetLoGainSamples(), sum, sat); + FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), sum, sat); fBlindPixel->SetExtractedSignal(sum); Index: trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.cc (revision 4189) +++ trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.cc (revision 4190) @@ -40,5 +40,5 @@ using namespace std; -static const UInt_t gkSignalInitializer = 99999; +static const Int_t gkSignalInitializer = 99999; // ------------------------------------------------------------------------ Index: trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h (revision 4189) +++ trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h (revision 4190) @@ -12,5 +12,5 @@ private: - UInt_t fExtractedSignal; // mean value of the extracted signal + Int_t fExtractedSignal; // mean value of the extracted signal Byte_t fFirst; @@ -33,5 +33,5 @@ // Setter - void SetExtractedSignal(const UInt_t sig ) { fExtractedSignal = sig; } + void SetExtractedSignal(const Int_t sig ) { fExtractedSignal = sig; } void SetNumSaturated( const Byte_t numsat ) { fNumSaturated = numsat; } void SetUsedFADCSlices( const Byte_t first, const Byte_t num); @@ -46,5 +46,5 @@ // Getter - UInt_t GetExtractedSignal() const { return fExtractedSignal; } + Int_t GetExtractedSignal() const { return fExtractedSignal; } Byte_t GetNumFADCSamples() const { return fNumFADCSamples; } Int_t GetBlindPixelIdx() const { return fBlindPixelIdx; }