Index: trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc~ =================================================================== --- trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc~ (revision 3221) +++ (revision ) @@ -1,162 +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): Markus Gaug 12/2003 -! Author(s): Thomas Bretz 12/2003 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MArrivalTimeCam -// -// Hold the Extracted Signal information for all pixels in the camera -// -///////////////////////////////////////////////////////////////////////////// -#include "MArrivalTimeCam.h" - -#include - -#include "MLog.h" -#include "MLogManip.h" - -#include "MArrivalTimePix.h" - -ClassImp(MArrivalTimeCam); - -using namespace std; - -// -------------------------------------------------------------------------- -// -// Default constructor. Creates a MArrivalTimePix object for each pixel -// -MArrivalTimeCam::MArrivalTimeCam(const char *name, const char *title) -{ - fName = name ? name : "MArrivalTimeCam"; - fTitle = title ? title : "Storage container for all Extracted Signal Information in the camera"; - - fArray = new TClonesArray("MArrivalTimePix", 1); -} - -// -------------------------------------------------------------------------- -// -// Delete the array conatining the pixel pedest information -// -MArrivalTimeCam::~MArrivalTimeCam() -{ - delete fArray; -} - -// -------------------------------------------------------------------------- -// -// Distribute logging stream to all childs -// -void MArrivalTimeCam::SetLogStream(MLog *lg) -{ - fArray->ForEach(MParContainer, SetLogStream)(lg); - MParContainer::SetLogStream(lg); -} - -// -------------------------------------------------------------------------- -// -// Set the size of the camera -// -void MArrivalTimeCam::InitSize(const UInt_t i) -{ - fArray->ExpandCreate(i); -} - -// -------------------------------------------------------------------------- -// -// Get the size of the MArrivalTimeCam -// -Int_t MArrivalTimeCam::GetSize() const -{ - return fArray->GetEntriesFast(); -} - -// -------------------------------------------------------------------------- -// -// Get i-th pixel (pixel index) -// -MArrivalTimePix &MArrivalTimeCam::operator[](Int_t i) -{ - return *static_cast(fArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th pixel (pixel index) -// -const MArrivalTimePix &MArrivalTimeCam::operator[](Int_t i) const -{ - return *static_cast(fArray->UncheckedAt(i)); -} - -void MArrivalTimeCam::Clear(Option_t *o) -{ - fArray->ForEach(TObject, Clear)(); -} - -void MArrivalTimeCam::Print(Option_t *o) const -{ - *fLog << all << GetDescriptor() << ":" << endl; - int idx = -1; - - TIter Next(fArray); - MArrivalTimePix *pix; - while ((pix=(MArrivalTimePix*)Next())) - { - idx++; - - if (!pix->IsValid()) - continue; - - *fLog << idx << ": "; - pix->Print(); - } -} - -Bool_t MArrivalTimeCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const -{ - switch (type) - { - case 0: - val = (*this)[idx].GetArrivalTimeHiGain(); - break; - case 1: - val = (*this)[idx].GetArrivalTimeHiGainError(); - break; - case 2: - val = (*this)[idx].GetArrivalTimeLoGain(); - break; - case 3: - val = (*this)[idx].GetArrivalTimeLoGainError(); - break; - default: - return kFALSE; - } - return val>=0; -} - -void MArrivalTimeCam::DrawPixelContent(Int_t num) const -{ - *fLog << warn << "MExtractedSignaCam::DrawPixelContent - not available." << endl; -} Index: trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h~ =================================================================== --- trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h~ (revision 3221) +++ (revision ) @@ -1,67 +1,0 @@ -#ifndef MARS_MArrivalTimeCam -#define MARS_MArrivalTimeCam - -#ifndef MARS_MParContainer -#include "MParContainer.h" -#endif - -#ifndef MARS_MCamEvent -#include "MCamEvent.h" -#endif - -class TClonesArray; -class MArrivalTimePix; - -class MArrivalTimeCam : public MParContainer, public MCamEvent -{ -private: - TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer? - - Byte_t fFirstUsedSliceHiGain; - Byte_t fFirstUsedSliceLoGain; - - Byte_t fLastUsedSliceHiGain; - Byte_t fLastUsedSliceLoGain; - -public: - - MArrivalTimeCam(const char *name=NULL, const char *title=NULL); - ~MArrivalTimeCam(); - - void Print(Option_t *o="") const; - void Clear(Option_t *o=""); - void SetLogStream(MLog *lg); - - void InitSize(const UInt_t i); - Int_t GetSize() const; - - Byte_t GetNumUsedFADCSlices() const { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; } - Byte_t GetNumUsedHiGainFADCSlices() const { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; } - Byte_t GetNumUsedLoGainFADCSlices() const { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; } - - Byte_t GetFirstUsedSliceHiGain() const { return fFirstUsedSliceHiGain; } - Byte_t GetLastUsedSliceHiGain() const { return fLastUsedSliceHiGain; } - - Byte_t GetFirstUsedSliceLoGain() const { return fFirstUsedSliceLoGain; } - Byte_t GetLastUsedSliceLoGain() const { return fLastUsedSliceLoGain; } - - void SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, - Byte_t firstl, Byte_t lastl) - { - fFirstUsedSliceHiGain = firsth; - fLastUsedSliceHiGain = lasth; - fFirstUsedSliceLoGain = firstl; - fLastUsedSliceLoGain = lastl; - } - - MArrivalTimePix &operator[](Int_t i); - const MArrivalTimePix &operator[](Int_t i) const; - - Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const; - void DrawPixelContent(Int_t num) const; - - ClassDef(MArrivalTimeCam, 0) // Storage Container for extracted signals in the camera -}; - -#endif - Index: trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc~ =================================================================== --- trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc~ (revision 3221) +++ (revision ) @@ -1,120 +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): Markus Gaug 12/2003 -! Author(s): Thomas Bretz 12/2003 -! -! Copyright: MAGIC Software Development, 2000-2003 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MArrivalTimePix -// -// This is the storage container to hold informations about the pedestal -// (offset) value of one Pixel (PMT). -// -///////////////////////////////////////////////////////////////////////////// -#include "MArrivalTimePix.h" - -#include "MLog.h" -#include "MLogManip.h" - -ClassImp(MArrivalTimePix); - -using namespace std; - -static const Float_t gkSignalInitializer = 99999.9; - -// ------------------------------------------------------------------------ -// -// MArrivalTimePix holds the extracted signal (HiGain and LoGain) -// of the FADC slices and its error. -// -// Additionally, the number of saturated HiGain and LoGain Slices are stored. -// -// Default values for the extracted signals are: 99999.9 -// -MArrivalTimePix::MArrivalTimePix(const char* name, const char* title) - : fArrivalTimeHiGain(gkSignalInitializer), - fArrivalTimeHiGainError(gkSignalInitializer), - fArrivalTimeLoGain(gkSignalInitializer), - fArrivalTimeLoGainError(gkSignalInitializer), - fIsLoGainUsed(kFALSE), - fNumHiGainSaturated(0), - fNumLoGainSaturated(0) -{ - fName = name ? name : "MArrivalTimePix"; - fTitle = title ? title : "Container of the Extracted Signals"; -} - -// ------------------------------------------------------------------------ -// -// Invalidate values -// -void MArrivalTimePix::Clear(Option_t *o) -{ - fArrivalTimeHiGain = gkSignalInitializer; - fArrivalTimeHiGainError = gkSignalInitializer; - fArrivalTimeLoGain = gkSignalInitializer; - fArrivalTimeLoGainError = gkSignalInitializer; - - fIsLoGainUsed = kFALSE; - - fNumHiGainSaturated = 0; - fNumLoGainSaturated = 0; -} - -void MArrivalTimePix::SetArrivalTime(Float_t sig, Float_t sigerr) -{ - fArrivalTimeHiGain = sig; - fArrivalTimeHiGainError = sigerr; -} - -void MArrivalTimePix::SetArrivalTime(Float_t sighi, Float_t sighierr, - Float_t siglo, Float_t sigloerr) -{ - fArrivalTimeHiGain = sighi; - fArrivalTimeHiGainError = sighierr; - fArrivalTimeLoGain = siglo; - fArrivalTimeLoGainError = sigloerr; -} - -Bool_t MArrivalTimePix::IsValid() const -{ - return fArrivalTimeHiGain >= 0. || fArrivalTimeHiGainError >= 0.; -} - -void MArrivalTimePix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) -{ - - fIsLoGainUsed = sat; - fNumHiGainSaturated = higain; - fNumLoGainSaturated = logain; -} - -void MArrivalTimePix::Print(Option_t *o) const -{ - *fLog << " Signal: " << fArrivalTimeHiGain - << " +- " << fArrivalTimeHiGainError - << " LoGain? " << fIsLoGainUsed - << " Nr. Sat. Hi Gain: " << fNumHiGainSaturated - << " Nr. Sat. Lo Gain: " << fNumLoGainSaturated - << endl; -} Index: trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h~ =================================================================== --- trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h~ (revision 3221) +++ (revision ) @@ -1,46 +1,0 @@ -#ifndef MARS_MArrivalTimePix -#define MARS_MArrivalTimePix - -#ifndef MARS_MParContainer -#include "MParContainer.h" -#endif - -class MArrivalTimePix : public MParContainer -{ -private: - Float_t fArrivalTimeHiGain; // mean value of the extracted signal - Float_t fArrivalTimeHiGainError; // error of the mean value of the extracted signal - Float_t fArrivalTimeLoGain; // mean value of the extracted signal - Float_t fArrivalTimeLoGainError; // error of the mean value of the extracted signal - - Bool_t fIsLoGainUsed; - Byte_t fNumHiGainSaturated; - Byte_t fNumLoGainSaturated; - -public: - MArrivalTimePix(const char* name=NULL, const char* title=NULL); - - void Clear(Option_t *o=""); - void Print(Option_t *o="") const; - - // Setter - void SetArrivalTime(Float_t sig, Float_t sigerr); - void SetArrivalTime(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr); - void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain); - - // Getter - Float_t GetArrivalTimeHiGain() const { return fArrivalTimeHiGain; } - Float_t GetArrivalTimeHiGainError() const { return fArrivalTimeHiGainError; } - - Float_t GetArrivalTimeLoGain() const { return fArrivalTimeLoGain; } - Float_t GetArrivalTimeLoGainError() const { return fArrivalTimeLoGainError; } - - Byte_t GetNumLoGainSaturated() const { return fNumLoGainSaturated; } - - Bool_t IsLoGainUsed() const { return fIsLoGainUsed; } - Bool_t IsValid() const; - - ClassDef(MArrivalTimePix, 0) // Storage Container for Extracted Signal information of one pixel -}; - -#endif Index: trunk/MagicSoft/Mars/msignal/Makefile~ =================================================================== --- trunk/MagicSoft/Mars/msignal/Makefile~ (revision 3221) +++ (revision ) @@ -1,57 +1,0 @@ -################################################################## -# -# makefile -# -# for the MARS software -# -################################################################## -include ../Makefile.conf.$(OSTYPE) -include ../Makefile.conf.general - -# -# Handling name of the Root Dictionary Files -# -CINT = Raw - -# -# Library name to creatre -# -LIB = mraw.a - -# -# connect the include files defined in the config.mk file -# -INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../MBase -# mgui (MCamEvent), mgeom(MGeomCam) - -#------------------------------------------------------------------------------ - -.SUFFIXES: .c .cc .cxx .h .hxx .o - -SRCFILES = MRawRunHeader.cc \ - MRawEvtHeader.cc \ - MRawEvtData.cc \ - MRawEvtPixelIter.cc \ - MRawCrateArray.cc \ - MRawCrateData.cc \ - MRawRead.cc \ - MRawFileWrite.cc \ - MRawFileRead.cc \ - MRawSocketRead.cc - -SRCS = $(SRCFILES) -HEADERS = $(SRCFILES:.cc=.h) -OBJS = $(SRCFILES:.cc=.o) - -############################################################ - -all: $(LIB) - -include ../Makefile.rules - -#clean: rmcint rmobjs rmcore rmlib - -mrproper: clean rmbak - -# @endcode - Index: trunk/MagicSoft/Mars/msignal/SignalCint.h~ =================================================================== --- trunk/MagicSoft/Mars/msignal/SignalCint.h~ (revision 3221) +++ (revision ) @@ -1,76 +1,0 @@ -/******************************************************************** -* RawCint.h -********************************************************************/ -#ifdef __CINT__ -#error RawCint.h/C is only for compilation. Abort cint. -#endif -#include -#include -#include -#include -#include -#define G__ANSIHEADER -#define G__DICTIONARY -#include "G__ci.h" -extern "C" { -extern void G__cpp_setup_tagtableRawCint(); -extern void G__cpp_setup_inheritanceRawCint(); -extern void G__cpp_setup_typetableRawCint(); -extern void G__cpp_setup_memvarRawCint(); -extern void G__cpp_setup_globalRawCint(); -extern void G__cpp_setup_memfuncRawCint(); -extern void G__cpp_setup_funcRawCint(); -extern void G__set_cpp_environmentRawCint(); -} - - -#include "TROOT.h" -#include "TMemberInspector.h" -#include "MRawRunHeader.h" -#include "MRawEvtHeader.h" -#include "MRawEvtData.h" -#include "MRawEvtPixelIter.h" -#include "MRawCrateArray.h" -#include "MRawCrateData.h" -#include "MRawRead.h" -#include "MRawFileWrite.h" -#include "MRawFileRead.h" -#include "MRawSocketRead.h" -#include "RawIncl.h" - -#ifndef G__MEMFUNCBODY -#endif - -extern G__linked_taginfo G__RawCintLN_istream; -extern G__linked_taginfo G__RawCintLN_TClass; -extern G__linked_taginfo G__RawCintLN_TBuffer; -extern G__linked_taginfo G__RawCintLN_TMemberInspector; -extern G__linked_taginfo G__RawCintLN_TObject; -extern G__linked_taginfo G__RawCintLN_ifstream; -extern G__linked_taginfo G__RawCintLN_TString; -extern G__linked_taginfo G__RawCintLN_TFile; -extern G__linked_taginfo G__RawCintLN_MParContainer; -extern G__linked_taginfo G__RawCintLN_MTime; -extern G__linked_taginfo G__RawCintLN_MArrayS; -extern G__linked_taginfo G__RawCintLN_MRawRunHeader; -extern G__linked_taginfo G__RawCintLN_MArrayB; -extern G__linked_taginfo G__RawCintLN_MRawEvtHeader; -extern G__linked_taginfo G__RawCintLN_MGeomCam; -extern G__linked_taginfo G__RawCintLN_MCamEvent; -extern G__linked_taginfo G__RawCintLN_MRawCrateArray; -extern G__linked_taginfo G__RawCintLN_TArrayC; -extern G__linked_taginfo G__RawCintLN_MRawEvtData; -extern G__linked_taginfo G__RawCintLN_MRawEvtPixelIter; -extern G__linked_taginfo G__RawCintLN_TClonesArray; -extern G__linked_taginfo G__RawCintLN_MRawCrateData; -extern G__linked_taginfo G__RawCintLN_MInputStreamID; -extern G__linked_taginfo G__RawCintLN_MParList; -extern G__linked_taginfo G__RawCintLN_MTask; -extern G__linked_taginfo G__RawCintLN_MRawRead; -extern G__linked_taginfo G__RawCintLN_TTree; -extern G__linked_taginfo G__RawCintLN_MRawFileWrite; -extern G__linked_taginfo G__RawCintLN_MRawFileRead; -extern G__linked_taginfo G__RawCintLN_MReadSocket; -extern G__linked_taginfo G__RawCintLN_MRawSocketRead; - -/* STUB derived class for protected member access */ Index: trunk/MagicSoft/Mars/msignal/SignalLinkDef.h~ =================================================================== --- trunk/MagicSoft/Mars/msignal/SignalLinkDef.h~ (revision 3221) +++ (revision ) @@ -1,21 +1,0 @@ -#ifdef __CINT__ - -#pragma link off all globals; -#pragma link off all classes; -#pragma link off all functions; - -#pragma link C++ class MRawRunHeader; - -#pragma link C++ class MRawEvtHeader; -#pragma link C++ class MRawEvtData; -#pragma link C++ class MRawEvtPixelIter+; - -#pragma link C++ class MRawCrateArray+; -#pragma link C++ class MRawCrateData+; - -#pragma link C++ class MRawRead+; -#pragma link C++ class MRawSocketRead+; -#pragma link C++ class MRawFileRead+; -#pragma link C++ class MRawFileWrite+; - -#endif