Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 2540) +++ /trunk/MagicSoft/Mars/Changelog (revision 2541) @@ -4,4 +4,18 @@ -*-*- END OF LINE -*-*- + + 2003/11/20: Wolfgang Wittek + + * mimage/M2dimFunctionFit.[h,cc] + - removed; will be replaced by MFun2Fit.[h,cc] + + * mimage/M2dimFunction.[h,cc] + - removed; will be replaced by MFunc2.[h,cc] + + * mimage/MH2dimFunction.[h,cc] + - removed; will be replaced by MHFunc2.[h,cc] + + + 2003/11/19: Markus Gaug @@ -31,4 +45,6 @@ * mcamera/*: - added + + @@ -540,4 +556,5 @@ for the parameters of the 2-dim function describing the shower image +>>>>>>> 1.777 Index: unk/MagicSoft/Mars/mimage/M2dimFunction.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/M2dimFunction.cc (revision 2540) +++ (revision ) @@ -1,276 +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): Wolfgang Wittek 10/2003 -! -! Copyright: MAGIC Software Development, 2000-2003 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// M2dimFunction -// -// Storage Container for the parameters of the 2-dim function describing -// the shower image -// -// -///////////////////////////////////////////////////////////////////////////// -#include "M2dimFunction.h" - -#include > - -#include "TMath.h" -#include "TVectorD.h" -#include "TMatrixD.h" - -#include "MLog.h" -#include "MLogManip.h" - -#include "MHillas.h" - -#include "MGeomCam.h" -#include "MGeomPix.h" - -#include "MCerPhotEvt.h" -#include "MCerPhotPix.h" - -ClassImp(M2dimFunction); - -using namespace std; - -// -------------------------------------------------------------------------- -// -// TwodimFunction -// -// this function calculates for a given set of parameters -// -// - the log likelihood function L to be minimized -// - beta_k = -1/2 * dL/da_k (a kind of gradient of L) -// - alfa_kl = 1/2 * dL/(da_k da_l) (a kind of second derivative of L) -// -// (see Numerical recipes (2nd ed.), W.H.Press et al., p. 687) -// -// Note : this is not a member function of M2dimFunction; -// it will be called by the minimization class MMarquardt; -// the address of this function is passed to MMarquardt -// in M2dimFunction::Fit() by the call MMarquardt::Loop() -// - -Bool_t TwodimFunction(TVectord &a, TMatrixD &alfa, TVectord &beta, Double_t &L) -{ - Int_t npar = a.GetNrows(); - Int_t npixels =; - - TMatrixD dmuda (npar, npixels); - TVector dLdmu (npixels); - TVector d2Ldmu2(npixels); - - //------------------------------------------ - // these are the parameters for which alfa, beta and L are calculated - - Double_t xbar = a(0); - Double_t ybar = a(1); - Double_t delta = a(2); - Double_t amp = a(3); - Double_t leng = a(4); - Double_t wid = a(5); - Double_t asy = a(6); - - - for (Int_t m=0; mGetMeanX(); - fVinit(1) = fhillas->GetMeanY(); - fVinit(2) = fhillas->GetDelta(); - } - else - { - fVinit(0) = ; - fVinit(1) = ; - fVinit(2) = ; - } - - fVinit(3) = - fVinit(4) = - fVinit(5) = - fVinit(6) = - - return; -} - - - -// -------------------------------------------------------------------------- -// -// Fit of the 2-dim function to the shower image -// -void M2dimFunction::Fit() -{ - fMarquardt.Loop(TwodimFunction, fVinit); - - SetReadyToSave(); -} - -// -------------------------------------------------------------------------- -// -void M2dimFunction::Print(Option_t *) const -{ - *fLog << all; - *fLog << "Parameters of 2-dim function (" << GetName() << ")" << endl; - *fLog << " - fXbar = " << fXbar << endl; - *fLog << " - fYbar = " << fYbar << endl; - *fLog << " - fAmp = " << fAmp << endl; - *fLog << " - fMajor = " << fMajor << endl; - *fLog << " - fMinor = " << fMinor << endl; - *fLog << " - fAsym = " << fAsym << endl; -} -//============================================================================ - - - - - - - - - - Index: unk/MagicSoft/Mars/mimage/M2dimFunction.h =================================================================== --- /trunk/MagicSoft/Mars/mimage/M2dimFunction.h (revision 2540) +++ (revision ) @@ -1,66 +1,0 @@ -#ifndef MARS_M2dimFunction -#define MARS_M2dimFunction - -#ifndef MARS_MParContainer -#include "MParContainer.h" -#endif - -class MHillas; -class MGeomCam; -class MCerPhotEvt; - -class M2dimFunction : public MParContainer -{ -private: - - // free parameters of the 2-dim function describing the shower image - Double_t fXbar, fYbar; // position where shower image has its maximum - Double_t fDelta; // angle between shower axis and x-axis - Double_t fAmp; // amplitude of shower image - Double_t fMajor; fMinor; // parameters describing the extension of - // the shower along and perpendicular - // to the shower axis - Double_t fAsym; // parameter describing the asymmetry along the - // shower axis - - TVectorD Vinit; // initial values of the parameters - -public: - M2dimFunction(const char *name=NULL, const char *title=NULL); - - void SetVinit(MHillas *fhillas); - - Fit(); - - ClassDef(M2dimFunction, 1) // Container to hold the parameters of the - // 2-dim function describing the shower image -}; - -#endif - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: unk/MagicSoft/Mars/mimage/M2dimFunctionFit.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/M2dimFunctionFit.cc (revision 2540) +++ (revision ) @@ -1,145 +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): Wolfgang Wittek 10/2003 -! -! Copyright: MAGIC Software Development, 2000-2003 -! -! -\* ======================================================================== */ - -////////////////////////////////////////////////////////////////////////////// -// -// M2dimFunctionFit -// -// Task to fit a 2-dim function to the shower image -// -////////////////////////////////////////////////////////////////////////////// -#include "M2dimFunctionFit.h" - -#include - -#include "MParList.h" - -#include "MGeomCam.h" -#include "MSrcPosCam.h" -#include "MCerPhotEvt.h" -#include "MNewImagePar.h" -#include "MNewImagePar.h" -#include "MLog.h" -#include "MLogManip.h" - -ClassImp(M2dimFunctionFit); - -static const TString gsDefName = "M2dimFunctionFit"; -static const TString gsDefTitle = "Fit 2-dim function"; - -// ------------------------------------------------------------------------- -// -// Default constructor. -// -// twodimfunname is the name of a container of type M2dimFunction, -// in which the parameters are stored; the default is "M2dimFunction" -// -// -M2dimFunctionFit::M2dimFunctionFit(const char *twodimfunname, - const char *name, const char *title) -{ - fName = name ? name : gsDefName.Data(); - fTitle = title ? title : gsDefTitle.Data(); - - f2dimFunName = twodimfunname; - fHillasInput = "MHillas"; -} - -// ------------------------------------------------------------------------- -// -Int_t M2dimFunctionFit::PreProcess(MParList *pList) -{ - fHillas = (MHillas*)pList->FindObject(fHillasInput, "MHillas"); - if (!fHillas) - { - *fLog << err << dbginf << "MHillas not found... aborting." << endl; - return kFALSE; - } - - - fCerPhotEvt = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt"); - if (!fCerPhotEvt) - { - *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl; - return kFALSE; - } - - fGeomCam = (MGeomCam*)pList->FindObject("MGeomCam"); - if (!fGeomCam) - { - *fLog << dbginf << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl; - return kFALSE; - } - - f2dimfun = (M2dimFunction*)pList->FindCreateObj("M2dimFunction", f2dimFunName); - if (!f2dimfun) - { - *fLog << dbginf << "M2dimFunction object '" << f2dimFunName - << "' not found... aborting." << endl; - return kFALSE; - } - - fErrors = 0; - - return kTRUE; -} - -// ------------------------------------------------------------------------- -// -// fit 2-dim function to the shower image -// - -Int_t M2dimFunctionFit::Process() -{ - Bool_t rc = f2dimfun->Fit(); - if (!rc) - { - fErrors++; - return kCONTINUE; - } - - return kTRUE; -} - -// -------------------------------------------------------------------------- -// -// Prints some statistics about the hillas calculation. The percentage -// is calculated with respect to the number of executions of this task. -// -/* -Bool_t M2dimFunctionFit::PostProcess() -{ - if (GetNumExecutions()==0) - return kTRUE; - - *fLog << inf << endl; - *fLog << GetDescriptor() << " execution statistics:" << endl; - *fLog << dec << setfill(' '); - *fLog << " " << fErrors << " (" << (int)(fErrors*100/GetNumExecutions()) << "%) Evts skipped due to: fit of 2-dim function failed" << endl; - *fLog << endl; - - return kTRUE; -} -*/ - Index: unk/MagicSoft/Mars/mimage/M2dimFunctionFit.h =================================================================== --- /trunk/MagicSoft/Mars/mimage/M2dimFunctionFit.h (revision 2540) +++ (revision ) @@ -1,52 +1,0 @@ -#ifndef MARS_M2dimFunctionFit -#define MARS_M2dimFunctionFit - -#ifndef MARS_MTask -#include "MTask.h" -#endif - -class MHillas; -class MNewImagePar; -class MSrcPosCam; -class MGeomCam; -class MCerPhotEvt; - -class M2dimFunctionFit : public MTask -{ -private: - MGeomCam *fGeomCam; - MCerPhotEvt *fCerPhotEvt; - - MHillas *fHillas; //! Pointer to the source independent hillas parameters - MSrcPosCam *fSrcPos; //! Pointer to the source position - MNewImagePar *fNewImagePar; //! Pointer to the output container for the new image parameters - - TString fSrcName; - TString fNewParName; - TString fHillasInput; - - Int_t fErrors; - - Bool_t PreProcess(MParList *plist); - Bool_t Process(); - Bool_t PostProcess(); - -public: - M2dimFunctionFit(const char *twodimfunname, - const char *name=NULL, const char *title=NULL); - - void SetInput(TString hilname) { fHillasInput = hilname; } - - ClassDef(M2dimFunctionFit, 0) // task to fit a 2-dim function to the shower image -}; - -#endif - - - - - - - - - Index: unk/MagicSoft/Mars/mimage/MH2dimFunction.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/MH2dimFunction.cc (revision 2540) +++ (revision ) @@ -1,205 +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): Wolfgang Wittek, 10/2003 -! -! Copyright: MAGIC Software Development, 2000-2003 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MH2dimFunction -// -// container of histograms for the parameters of the 2-dim function -// describing the shower image -// -//////////////////////////////////////////////////////////////////////////// -#include "MH2dimFunction.h" - -#include - -#include -#include -#include - -#include "MLog.h" -#include "MLogManip.h" - -#include "MGeomCam.h" -#include "MBinning.h" -#include "MParList.h" - -#include "MHillas.h" -#include "M2dimFunction.h" - -ClassImp(MH2dimFunction); - -using namespace std; - -// -------------------------------------------------------------------------- -// -// Setup histograms -// -MH2dimFunction::MH2dimFunction(const char *name, const char *title) -{ - fName = name ? name : "MH2dimFunction"; - fTitle = title ? title : "Histograms of parameters of 2-dim function"; - - fHistXbarYbar.SetName("shower-maximum"); - fHistXbarYbar.SetTitle("position of maximum of shower"); - fHistXbarYbar.SetXTitle("x-position of maximum of shower image"); - fHistXbarYbar.SetYTitle("y-position of maximum of shower image"); - fHistXbarYbar.SetDirectory(NULL); - fHistXbarYbar.SetFillStyle(4000); - fHistXbarYbar.UseCurrentStyle(); - - fHistAmp.SetName("Amplitude parameter"); - fHistAmp.SetTitle("amplitude parameter"); - fHistAmp.SetXTitle("amplitude parameter"); - fHistAmp.SetYTitle("Counts"); - fHistAmp.SetDirectory(NULL); - fHistAmp.SetFillStyle(4000); - fHistAmp.UseCurrentStyle(); - - fHistMajor.SetName("Length parameter"); - fHistMajor.SetTitle("length parameter"); - fHistMajor.SetXTitle("length parameter"); - fHistMajor.SetYTitle("Counts"); - fHistMajor.SetDirectory(NULL); - fHistMajor.SetLineColor(kBlue); - fHistMajor.SetFillStyle(4000); - fHistMajor.UseCurrentStyle(); - - fHistMinor.SetName("Width parameter"); - fHistMinor.SetTitle("width parameter"); - fHistMinor.SetXTitle("width parameter"); - fHistMinor.SetYTitle("Counts"); - fHistMinor.SetDirectory(NULL); - fHistMinor.SetLineColor(kGreen); - fHistMinor.SetFillStyle(4000); - fHistMinor.UseCurrentStyle(); - - fHistAsym.SetName("Asymmetry parameter"); - fHistAsym.SetTitle("asymmetry parameter"); - fHistAsym.SetXTitle("asymmetry parameter"); - fHistAsym.SetYTitle("Counts"); - fHistAsym.SetDirectory(NULL); - fHistAsym.SetFillStyle(4000); - fHistAsym.UseCurrentStyle(); - - MBinning bins; - - bins.SetEdges(100, 0, 1); - bins.Apply(fHistAmp); - - bins.SetEdges(100, 0, 1); - bins.Apply(fHistMajor); - - bins.SetEdges(100, 0, 1); - bins.Apply(fHistMinor); - - bins.SetEdges(100, 0, 1); - bins.Apply(fHistAsym); -} - -// -------------------------------------------------------------------------- -// -// Setup the Binning for the histograms automatically if the correct -// instances of MBinning -// -Bool_t MH2dimFunction::SetupFill(const MParList *plist) -{ - ApplyBinning(*plist, "XbarYbar", &fHistXbarYbar); - ApplyBinning(*plist, "Amp", &fHistAmp); - ApplyBinning(*plist, "Major", &fHistMajor); - ApplyBinning(*plist, "Minor", &fHistMinor); - ApplyBinning(*plist, "Asym", &fHistAsym); - - return kTRUE; -} - - -// -------------------------------------------------------------------------- -// -// Fill the histograms with data from a M2dimFunction container. -// -Bool_t MH2dimFunction::Fill(const MParContainer *par, const Stat_t w) -{ - if (!par) - { - *fLog << err << "MH2dimFunction::Fill: Pointer (!=NULL) expected." << endl; - return kFALSE; - } - - const M2dimFunction &h = *(M2dimFunction*)par; - - fHistXbarYbar.Fill(h.GetXbar(), h.GetYbar(), w); - fHistAmp.Fill(h.GetAmp(), w); - - fHistMajor.Fill(h.GetMajor(), w); - fHistMinor.Fill(h.GetMinor(), w); - - fHistAsym.Fill(h.GetAsym(), w); - - return kTRUE; -} - -// -------------------------------------------------------------------------- -// -// Creates a new canvas and draws the two histograms into it. -// Be careful: The histograms belongs to this object and won't get deleted -// together with the canvas. -// -void MH2dimFunction::Draw(Option_t *) -{ - TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this); - pad->SetBorderMode(0); - - AppendPad(""); - - pad->Divide(2,2); - - pad->cd(1); - gPad->SetBorderMode(0); - TAxis &x = *fHistLeakage1.GetXaxis(); - x.SetRangeUser(0.0, x.GetXmax()); - MH::DrawSame(fHistLeakage1, fHistLeakage2, "Leakage1 and Leakage2"); - - pad->cd(2); - gPad->SetBorderMode(0); - MH::DrawSame(fHistCorePix, fHistUsedPix, "Number of core/used Pixels"); - - pad->cd(3); - gPad->SetBorderMode(0); - MH::DrawSame(fHistConc1, fHistConc, "Concentrations"); - - pad->cd(4); - gPad->SetBorderMode(0); - - pad->Modified(); - pad->Update(); -} - -//========================================================================== - - - - - - Index: unk/MagicSoft/Mars/mimage/MH2dimFunction.h =================================================================== --- /trunk/MagicSoft/Mars/mimage/MH2dimFunction.h (revision 2540) +++ (revision ) @@ -1,47 +1,0 @@ -#ifndef MARS_MH2dimFunction -#define MARS_MH2dimFunction - -#ifndef MARS_MH -#include "MH.h" -#endif -#ifndef ROOT_TH1 -#include -#endif - -class MHillas; - -class MH2dimFunction : public MH -{ -private: - - TH1F fHistXbarYbar; // position where shower image has its maximum - TH1F fHistAmp; // amplitude of shower image - TH1F fHistMajor; // 'length' of shower image - TH1F fHistMinor; // 'width' of shower image - TH1F fHistAsym; // 'asymmetry' of shower image - - -public: - MH2dimFunction(const char *name=NULL, const char *title=NULL); - - Bool_t SetupFill(const MParList *plist); - Bool_t Fill(const MParContainer *par, const Stat_t w=1); - - TH1F &GetHistXbarYbar() { return fHistXbarYbar; } - TH1F &GetHistAmp() { return fHistAmp; } - - TH1F &GetHistMajor() { return fHistMajor; } - TH1F &GetHistMinor() { return fHistMinor; } - - TH1F &GetHistAsym() { return fHistAsym; } - - void Draw(Option_t *opt=NULL); - - ClassDef(MH2dimFunction, 1) // Histograms of parameters of 2-dim function -}; - -#endif - - - -