Index: trunk/MagicSoft/Mars/mhist/HistLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mhist/HistLinkDef.h (revision 2239) +++ trunk/MagicSoft/Mars/mhist/HistLinkDef.h (revision 2244) @@ -44,6 +44,5 @@ #pragma link C++ class MHCamera+; -//#pragma link C++ class MHCurrents+; -//#pragma link C++ class MHOnSubtraction+; +#pragma link C++ class MHPixVsTime+; #endif Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc (revision 2239) +++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc (revision 2244) @@ -43,5 +43,4 @@ #include "MGeomCam.h" -#include "MGeomPix.h" ClassImp(MHCamEvent); Index: trunk/MagicSoft/Mars/mhist/MHCamera.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 2239) +++ trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 2244) @@ -93,5 +93,5 @@ virtual void SetCamContent(const MCamEvent &evt, Int_t type=0) { Reset(); AddCamContent(evt, type); } virtual void SetCamContent(const TArrayD &evt, const TArrayC *used=NULL) { Reset(); AddCamContent(evt, used); } - virtual void SetCamContent(const MHCamera &d, Int_t type=0) { Reset(), AddCamContent(d, type); } + virtual void SetCamContent(const MHCamera &d, Int_t type=0) { Reset(); fEntries=d.fEntries-1; AddCamContent(d, type); } virtual void CntCamContent(const MCamEvent &evt, Double_t threshold, Int_t type=0); virtual void CntCamContent(const TArrayD &evt, Double_t threshold, Bool_t ispos=kTRUE); Index: trunk/MagicSoft/Mars/mhist/MHPixVsTime.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHPixVsTime.cc (revision 2244) +++ trunk/MagicSoft/Mars/mhist/MHPixVsTime.cc (revision 2244) @@ -0,0 +1,168 @@ +/* ======================================================================== *\ +! +! * +! * 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, 12/2002 +! +! Copyright: MAGIC Software Development, 2000-2003 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MHPixVsTime +// +// A histogram to store the sum of camera events. This can be photons, +// currents or enything else derived from MPixVsTime +// +///////////////////////////////////////////////////////////////////////////// +#include "MHPixVsTime.h" + +#include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MParList.h" +#include "MCamEvent.h" + +#include "MGeomCam.h" + +ClassImp(MHPixVsTime); + +using namespace std; + +// -------------------------------------------------------------------------- +// +// Initialize the name and title of the task. +// Resets the sum histogram +// +MHPixVsTime::MHPixVsTime(Int_t idx, const char *name, const char *title) + : fIndex(idx), fEvt(NULL), fType(0) +{ + // + // set the name and title of this object + // + fName = name ? name : "MHPixVsTime"; + fTitle = title ? title : "Average of MPixVsTimes"; + + TString t("Pixel Index #"); + t += idx; + t += " vs. time"; + + fGraph.SetName("MCamEvent"); + fGraph.SetTitle(t); +} + +// -------------------------------------------------------------------------- +// +// Delete the corresponding camera display if available +// +MHPixVsTime::~MHPixVsTime() +{ +} + +// -------------------------------------------------------------------------- +// +// Get the event (MPixVsTime) the histogram might be filled with. If +// it is not given, it is assumed, that it is filled with the argument +// of the Fill function. +// Looks for the camera geometry MGeomCam and resets the sum histogram. +// +Bool_t MHPixVsTime::SetupFill(const MParList *plist) +{ + fEvt = (MCamEvent*)plist->FindObject(fNameEvt, "MCamEvent"); + if (!fEvt) + { + if (!fNameEvt.IsNull()) + { + *fLog << err << GetDescriptor() << ": No " << fNameEvt <<" [MCamEvent] available..." << endl; + return kFALSE; + } + *fLog << warn << GetDescriptor() << ": No MCamEvent available..." << endl; + } + + fCam = (MGeomCam*)plist->FindObject("MGeomCam"); + if (!fCam) + { + *fLog << err << "MGeomCam not found... aborting." << endl; + return kFALSE; + } + + return kTRUE; +} + +// -------------------------------------------------------------------------- +// +// Fill the histograms with data from a MPixVsTime-Container. +// +Bool_t MHPixVsTime::Fill(const MParContainer *par, const Stat_t w) +{ + const MCamEvent *evt = par ? dynamic_cast(par) : fEvt; + if (!evt) + { + *fLog << err << dbginf << "No MCamEvent found..." << endl; + return kFALSE; + } + + Double_t val = 0; + evt->GetPixelContent(val, fIndex, *fCam, fType); + if (TMath::IsNaN(val)) + return kCONTINUE; + + fGraph.SetPoint(fGraph.GetN(), fGraph.GetN(), val); + return kTRUE; +} + +// -------------------------------------------------------------------------- +// +// Scale the sum container with the number of entries +// +Bool_t MHPixVsTime::Finalize() +{ + return kTRUE; +} + +// -------------------------------------------------------------------------- +// +// Return fSum. +// +TH1 *MHPixVsTime::GetHistByName(const TString name) +{ + return fGraph.GetHistogram(); +} + +void MHPixVsTime::Draw(Option_t *) +{ + /* + TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this); + pad->SetBorderMode(0); + + pad->Divide(2,2); + + pad->cd(1); + gPad->SetBorderMode(0); + gPad->Divide(1,1); + gPad->cd(1); + gPad->SetBorderMode(0); + fSum->Draw(); + + pad->cd(3); + gPad->SetBorderMode(0); + fSum->Draw("EPhist"); + */ +} Index: trunk/MagicSoft/Mars/mhist/MHPixVsTime.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHPixVsTime.h (revision 2244) +++ trunk/MagicSoft/Mars/mhist/MHPixVsTime.h (revision 2244) @@ -0,0 +1,49 @@ +#ifndef MARS_MHPixVsTime +#define MARS_MHPixVsTime + +#ifndef MARS_MH +#include "MH.h" +#endif + +#ifndef ROOT_TGraph +#include +#endif + +class MHCamera; +class MCamEvent; +class MGeomCam; + +class MHPixVsTime : public MH +{ +private: + TGraph fGraph; + Int_t fIndex; + + MCamEvent *fEvt; //! the current event + MGeomCam *fCam; //! the camera geometry + + TString fNameEvt; + + Int_t fType; + Int_t fTypeErr; + + Bool_t SetupFill(const MParList *pList); + Bool_t Fill(const MParContainer *par, const Stat_t w=1); + Bool_t Finalize(); + +public: + MHPixVsTime(Int_t idx=0, const char *name=NULL, const char *title=NULL); + ~MHPixVsTime(); + + void SetNameEvt(const TString name) { fNameEvt = name; } + void SetType(Int_t type, Int_t e=-1) { fType = type; fTypeErr=e; } + + TH1 *GetHistByName(const TString name=""); + TGraph &GetGraph() { return fGraph; } + + void Draw(Option_t *o=""); + + ClassDef(MHPixVsTime, 1) // Histogram to sum camera events +}; + +#endif Index: trunk/MagicSoft/Mars/mhist/Makefile =================================================================== --- trunk/MagicSoft/Mars/mhist/Makefile (revision 2239) +++ trunk/MagicSoft/Mars/mhist/Makefile (revision 2244) @@ -37,4 +37,5 @@ MH3.cc \ MHCamEvent.cc \ + MHPixVsTime.cc \ MHMatrix.cc \ MHFadcPix.cc \