Index: /fact/tools/rootmacros/DrsCalibration.C =================================================================== --- /fact/tools/rootmacros/DrsCalibration.C (revision 13534) +++ /fact/tools/rootmacros/DrsCalibration.C (revision 13535) @@ -2,9 +2,11 @@ #include +using namespace std; + float getValue( int slice, int pixel, vector &drs_basemean, vector &drs_gainmean, vector &drs_triggeroffsetmean, - UInt_t RegionOfInterest, + unsigned int RegionOfInterest, vector AllPixelDataVector, vector StartCellVector @@ -56,5 +58,5 @@ vector &drs_gainmean, vector &drs_triggeroffsetmean, - UInt_t RegionOfInterest, + unsigned int RegionOfInterest, vector AllPixelDataVector, vector StartCellVector, Index: /fact/tools/rootmacros/DrsCalibration.h =================================================================== --- /fact/tools/rootmacros/DrsCalibration.h (revision 13534) +++ /fact/tools/rootmacros/DrsCalibration.h (revision 13535) @@ -6,23 +6,24 @@ float getValue( int slice, int pixel, - vector &drs_basemean, - vector &drs_gainmean, - vector &drs_triggeroffsetmean, - UInt_t RegionOfInterest, - vector AllPixelDataVector, - vector StartCellVector + std::vector &drs_basemean, + std::vector &drs_gainmean, + std::vector &drs_triggeroffsetmean, + unsigned int RegionOfInterest, + std::vector AllPixelDataVector, + std::vector StartCellVector ); -size_t applyDrsCalibration( vector &destination, - int pixel, - int LeaveOutLeft, - int LeaveOutRight, - vector &drs_basemean, - vector &drs_gainmean, - vector &drs_triggeroffsetmean, - UInt_t RegionOfInterest, - vector AllPixelDataVector, - vector StartCellVector, - int verbosityLevel = 1 +size_t applyDrsCalibration( + std::vector &destination, + int pixel, + int LeaveOutLeft, + int LeaveOutRight, + std::vector &drs_basemean, + std::vector &drs_gainmean, + std::vector &drs_triggeroffsetmean, + unsigned int RegionOfInterest, + std::vector AllPixelDataVector, + std::vector StartCellVector, + int verbosityLevel = 1 ); Index: /fact/tools/rootmacros/PulseTemplates/Makefile =================================================================== --- /fact/tools/rootmacros/PulseTemplates/Makefile (revision 13534) +++ /fact/tools/rootmacros/PulseTemplates/Makefile (revision 13535) @@ -1,4 +1,40 @@ -all: - g++ -o pulseoverlay FPulseOverlay.C -I`root-config --incdir` `root-config --glibs` +CXXFLAGS = -I`root-config --incdir` `root-config --glibs` -Wall -g +CC = g++ +RM = rm + +OBJ = openFits.o discriminator.o zerosearch.o factfir.o \ + DrsCalibration.o SpikeRemoval.o rootfilehandler.o pixel.o + +BINNAME = pulseoverlay + +$(BINNAME): $(OBJ) + $(CC) $(CXXFLAGS) FPulseOverlay.C $(OBJ) -o $@ + +openFits.o : ../openFits.c ../openFits.h ../fits.h ../izstream.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +discriminator.o : ../discriminator.C ../discriminator.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +zerosearch.o : ../zerosearch.C ../zerosearch.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +factfir.o : ../factfir.C ../factfir.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +DrsCalibration.o : ../DrsCalibration.C ../DrsCalibration.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +SpikeRemoval.o : ../SpikeRemoval.C ../SpikeRemoval.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +rootfilehandler.o : rootfilehandler.C rootfilehandler.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +pixel.o : pixel.C pixel.h + $(CC) $(CXXFLAGS) -c $< -o $@ + +all: $(BINNAME) + clean: - rm main + $(RM) *.o Index: /fact/tools/rootmacros/PulseTemplates/rootfilehandler.C =================================================================== --- /fact/tools/rootmacros/PulseTemplates/rootfilehandler.C (revision 13534) +++ /fact/tools/rootmacros/PulseTemplates/rootfilehandler.C (revision 13535) @@ -3,5 +3,5 @@ #include "rootfilehandler.h" - +#include using namespace std; Index: /fact/tools/rootmacros/SpikeRemoval.C =================================================================== --- /fact/tools/rootmacros/SpikeRemoval.C (revision 13534) +++ /fact/tools/rootmacros/SpikeRemoval.C (revision 13535) @@ -2,4 +2,5 @@ #include +using namespace std; // compute the mean of the left and right neighbors of a channel Index: /fact/tools/rootmacros/SpikeRemoval.h =================================================================== --- /fact/tools/rootmacros/SpikeRemoval.h (revision 13534) +++ /fact/tools/rootmacros/SpikeRemoval.h (revision 13535) @@ -4,9 +4,9 @@ #include -vector * computeN1mean( vector &src); +std::vector * computeN1mean( std::vector &src); void removeSpikes( - vector &src, - vector &dest, + std::vector &src, + std::vector &dest, const float CandidateTHR = -5.0, const float nextDiffTHR = -1.6, Index: /fact/tools/rootmacros/factfir.C =================================================================== --- /fact/tools/rootmacros/factfir.C (revision 13534) +++ /fact/tools/rootmacros/factfir.C (revision 13535) @@ -1,5 +1,8 @@ -#include + #include #include "factfir.h" + +using namespace std; + // source vector is void factfir(double b, vector &a, int k, vector &source, vector &dest){ Index: /fact/tools/rootmacros/factfir.h =================================================================== --- /fact/tools/rootmacros/factfir.h (revision 13534) +++ /fact/tools/rootmacros/factfir.h (revision 13535) @@ -2,14 +2,17 @@ #define __FACTFIR_H +#include + + void factfir( double b, - vector &a, + std::vector &a, int k, - vector &source, - vector &dest); + std::vector &source, + std::vector &dest); void sliding_avg( - vector &source, - vector &dest, + std::vector &source, + std::vector &dest, unsigned int HalfWidth); #endif // __FACTFIR_H Index: /fact/tools/rootmacros/izstream.h =================================================================== --- /fact/tools/rootmacros/izstream.h (revision 13534) +++ /fact/tools/rootmacros/izstream.h (revision 13535) @@ -15,4 +15,6 @@ #else #include +#include "string.h" +#include #endif Index: /fact/tools/rootmacros/openFits.c =================================================================== --- /fact/tools/rootmacros/openFits.c (revision 13534) +++ /fact/tools/rootmacros/openFits.c (revision 13535) @@ -3,5 +3,5 @@ #include "stdint.h" - +using namespace std; // Opens FACT Fits Raw Data -- for more Info refer to header file @@ -12,6 +12,6 @@ vector &StartCells, // vector, which will be filled with DRS start positions unsigned int &EventID, // index of the current event - UInt_t &RegionOfInterest, // Width of the Region, read out of the DRS - UInt_t &NumberOfPixels, // Total number of pixel, read out of the camera + unsigned int &RegionOfInterest, // Width of the Region, read out of the DRS + unsigned int &NumberOfPixels, // Total number of pixel, read out of the camera size_t &PXLxROI, // Size of column "Data" = #Pixel x ROI // this can be used, to x-check RegionOfInterest and NumberOfPixels Index: /fact/tools/rootmacros/openFits.h =================================================================== --- /fact/tools/rootmacros/openFits.h (revision 13534) +++ /fact/tools/rootmacros/openFits.h (revision 13535) @@ -6,13 +6,14 @@ #include #include "stdint.h" +#include size_t openDataFits( const char *datafilename, // path to fits file containing FACT raw data - fits * * datafile, // ptr to pointer, where to return the fits object - vector &Data, // vector, which will be filled with raw data - vector &StartCells, // vector, which will be filled with DRS start positions + std::fits * * datafile, // ptr to pointer, where to return the fits object + std::vector &Data, // vector, which will be filled with raw data + std::vector &StartCells, // vector, which will be filled with DRS start positions unsigned int &EventID, // index of the current event - UInt_t &RegionOfInterest, // Width of the Region, read out of the DRS - UInt_t &NumberOfPixels, // Total number of pixel, read out of the camera + unsigned int &RegionOfInterest, // Width of the Region, read out of the DRS + unsigned int &NumberOfPixels, // Total number of pixel, read out of the camera size_t &PXLxROI, // Size of column "Data" = #Pixel x ROI // this can be used, to x-check RegionOfInterest and NumberOfPixels @@ -22,7 +23,7 @@ size_t openCalibFits( const char *FileName, // path to fits file - vector &Offset, - vector &Gain, - vector &TriggerOffset, + std::vector &Offset, + std::vector &Gain, + std::vector &TriggerOffset, size_t &TriggerOffsetROI, int VerbosityLevel =0 Index: /fact/tools/rootmacros/zerosearch.C =================================================================== --- /fact/tools/rootmacros/zerosearch.C (revision 13534) +++ /fact/tools/rootmacros/zerosearch.C (revision 13535) @@ -1,7 +1,8 @@ #include "Region.h" #include -#include #include "zerosearch.h" + +using namespace std; // searches for zero crossings in a given vector of floats Index: /fact/tools/rootmacros/zerosearch.h =================================================================== --- /fact/tools/rootmacros/zerosearch.h (revision 13534) +++ /fact/tools/rootmacros/zerosearch.h (revision 13535) @@ -4,7 +4,8 @@ #include "Region.h" +#include -vector *zerosearch( - vector &input, +std::vector *zerosearch( + std::vector &input, int edge = 1, // search for transitions on rising edge=1, -1:falling unsigned int step = 4, // search in steps of step @@ -12,9 +13,10 @@ ); -size_t ShiftRegionBy(vector &src, +size_t ShiftRegionBy( + std::vector &src, int Shift, int VerbosityLevel=0); -size_t EnlargeRegion(vector &src, +size_t EnlargeRegion(std::vector &src, int Left, int Right, @@ -22,6 +24,6 @@ size_t findAbsMaxInRegions( - vector ®ions, - vector &data, + std::vector ®ions, + std::vector &data, int VerbosityLevel=0); @@ -29,9 +31,9 @@ size_t removeEqualMaxima( - vector ®ions, + std::vector ®ions, int VerbosityLevel=0); size_t removeRegionOnFallingEdge( - vector ®ions, + std::vector ®ions, unsigned int FallingEdgeWidth = 100, int VerbosityLevel=0); @@ -39,25 +41,25 @@ size_t removeRegionWithMaxOnEdge( - vector ®ions, + std::vector ®ions, unsigned int EdgeWidth=3, int VerbosityLevel=0); size_t removeMaximaBelow( - vector ®ions, + std::vector ®ions, float threshold = 2.0, int VerbosityLevel=0); size_t removeMaximaAbove( - vector ®ions, + std::vector ®ions, float threshold= 14.0, int VerbosityLevel=0); Region FindAbsMax( - vector ®ions, + std::vector ®ions, int VerbosityLevel=0); size_t findTimeOfHalfMaxLeft( - vector ®ions, - vector &data, + std::vector ®ions, + std::vector &data, float baseline = -0.5, int beginRisingEdge = 5,