Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 858) +++ trunk/MagicSoft/Mars/Changelog (revision 859) @@ -1,3 +1,91 @@ -*-*- END -*-*- + 2001/07/06: Thomas Bretz + + * mfilter/FilterIncl.h, mfilter/FilterLinkDef.h, + mfilter/MFTriggerLvl1.[h,cc], mfilter/mfilter/Makefile: + - added + + * Makefile + - mfilter added + + * Makefile.conf.linux-gnu: + - added some warning options + + * Makefile.conf.osf1: + - enhanced warnings + + * manalysis/MCerPhotEvt.cc: + - removed a small buf from the constructor + + * BaseLinkDef.h: + - added MFilter + - added MFilterList + + * mbase/MLog.[h,cc]: + - added a non-empty copy constructor to make cxx happy + + * mbase/MParList.[h,cc]: + - added second overload-function FindObject + + * mbase/MTask.h: + - added all Filter stuff + + * mbase/MTaskList.cc: + - changed debug output + - added filter-stuff to Process + + * mbase/MTaskList.h: + - changed Print default option from NULL to "" + + * mbase/Makefile: + - added MFilter + - added MFilterList + + * mhist/MFillHFadc.cc: + removed a small bug in the PreProcessing + + * manalysis/MCerPhotEvt.h, manalysis/MHillas.cc, manalysis/MHillas.h, + manalysis/MImgCleanStd.cc, manalysis/MPedestalCam.h, mgui/MGeomCam.h, + mhist/MFillHHillas.h, manalysis/MHillasCalc.h, manalysis/MCerPhotCalc.h, + manalysis/MImgCleanStd.h, mhist/MFillHStarMap.h, mhist/MHHillas.cc, + mhist/MHHillas.h, mhist/MHStarMap.cc, mhist/MHStarMap.h, + mmc/MMcFadcHeader.hxx, mmc/MMcFadcHeader.hxx, mmc/MMcTrig.hxx, + mmontecarlo/MMcThresholdCalc.h: + - made more const-correct + + * manalysis/MCT1ReadAscii.cc, manalysis/MCerPhotCalc.cc, + manalysis/MHillasCalc.cc, manalysis/MImgCleanStd.cc, + manalysis/MMcPedestalCopy.cc, manalysis/MPedCalcPedRun.cc, + mhist/MFillHFadc.cc, mhist/MFillHHillas.cc, mhist/MFillHStarMap.cc, + mmontecarlo/MMcThresholdCalc.cc, mraw/MRawFileRead.cc, + mraw/MRawFileWrite.cc: + - added comments + + * manalysis/MCT1ReadAscii.cc, manalysis/MCerPhotCalc.cc, + manalysis/MCerPhotPix.cc, manalysis/MHillas.cc, + manalysis/MHillasCalc.cc, manalysis/MImgCleanStd.cc, + manalysis/MMcPedestalCopy.cc, manalysis/MMcPedestalCopy.h, + manalysis/MPedCalcPedRun.cc, manalysis/MPedestalCam.cc, + manalysis/MPedestalPix.cc, + mbase/MArray.cc, mbase/MArrayB.cc, mbase/MArrayS.cc, mbase/MEvtLoop.cc, + mbase/MLog.cc, mbase/MParList.cc, mbase/MReadTree.cc, mbase/MTask.cc, + mbase/MTime.cc, mbase/MWriteAsciiFile.cc, mbase/MWriteFile.cc, + mbase/MWriteRootFile.cc, + mhist/MFillHFadc.cc, mhist/MFillHFadc.cc, mhist/MFillHHillas.cc, + mhist/MFillHStarMap.cc, mhist/MHFadcCam.cc, mhist/MHFadcPix.cc, + mhist/MHHillas.cc, mhist/MHMcCollectionArea.cc, mhist/MHMcEnergies.cc, + mhist/MHMcEnergy.cc, mhist/MHStarMap.cc, mraw/MRawCrateArray.cc, + mraw/MRawCrateData.cc, mraw/MRawEvtData.cc, mraw/MRawEvtHeader.cc, + mraw/MRawEvtPixelIter.cc, mraw/MRawFileRead.cc, + mraw/MRawFileWrite.cc, mraw/MRawRunHeader.cc: + - added semicolon after ClassImp to make my editor happy + + * mmain/MEvtDisp.cc: + - removed a wrong comma in the enumerations + + * mmontecarlo/MMcThresholdCalc.cc: + - made compile on osf by removing brackets in new steatement (constructor) + + 2001/07/05: Thomas Bretz Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 858) +++ trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 859) @@ -86,10 +86,10 @@ // if no canvas is yet existing to draw into, create a new one // - if ( !gPad ) new TCanvas("display", "MAGIC display", 0, 0, 650, 500) ; + if (!gPad) new TCanvas("display", "MAGIC display", 0, 0, 650, 500); // // draw all pixels of the camera // - for (UInt_t i=0; i< fNumPixels; i++) + for (UInt_t i=0; iDraw(); Index: trunk/MagicSoft/Mars/mgui/MGeomCam.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomCam.h (revision 858) +++ trunk/MagicSoft/Mars/mgui/MGeomCam.h (revision 859) @@ -31,5 +31,6 @@ UInt_t GetNumPixels() const { return fNumPixels; } - MGeomPix &operator[](Int_t i) { return *(MGeomPix*)fPixels->At(i); } + MGeomPix &operator[](Int_t i) { return *(MGeomPix*)fPixels->At(i); } + MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->At(i); } virtual void Print(Option_t *opt=NULL); Index: trunk/MagicSoft/Mars/mhist/MFillHFadc.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHFadc.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MFillHFadc.cc (revision 859) @@ -25,11 +25,17 @@ ////////////////////////////////////////////////////////////////////////////// -// -// MFillHFadc -// -// This task fill the n time slices from all pixels -// (stored in a MRawEvtData container) into histograms. -// This histograms (one per pixel) are stored in MHFadcCam, MHFadcPix -// +// // +// MFillHFadc // +// // +// This task fill the n time slices from all pixels // +// (stored in a MRawEvtData container) into histograms. // +// This histograms (one per pixel) are stored in MHFadcCam, MHFadcPix // +// // +// Input Containers: // +// MRawEvtData // +// // +// Output Containers: // +// MHFadcCam // +// // ////////////////////////////////////////////////////////////////////////////// @@ -43,5 +49,5 @@ #include "MRawEvtPixelIter.h" -ClassImp(MFillHFadc) +ClassImp(MFillHFadc); // -------------------------------------------------------------------------- @@ -62,8 +68,8 @@ // check if all necessary input containers are existing // - fRawEvtData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData"); + fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData"); if (!fRawEvtData) { - *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl; + *fLog << dbginf << "MRawEvtData not found... exit." << endl; return kFALSE; } Index: trunk/MagicSoft/Mars/mhist/MFillHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHHillas.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MFillHHillas.cc (revision 859) @@ -24,12 +24,18 @@ \* ======================================================================== */ -//////////////////////////////////////////////////////////////////////// -// -// MFillHHillas -// -// This task fills the hillas parameter from MHillas into -// histograms (MHHillas) -// -//////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +// // +// MFillHHillas // +// // +// This task fills the hillas parameter from MHillas into // +// histograms (MHHillas) // +// // +// Input Containers: // +// MHillas // +// // +// Output Containers: // +// MHHillas // +// // +////////////////////////////////////////////////////////////////////////////// #include "MFillHHillas.h" @@ -39,5 +45,5 @@ #include "MParList.h" -ClassImp(MFillHHillas) +ClassImp(MFillHHillas); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MFillHHillas.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHHillas.h (revision 858) +++ trunk/MagicSoft/Mars/mhist/MFillHHillas.h (revision 859) @@ -16,5 +16,5 @@ class MFillHHillas : public MTask { private: - MHillas *fEvt; + const MHillas *fEvt; MHHillas *fHistos ; Index: trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc (revision 859) @@ -23,13 +23,19 @@ \* ======================================================================== */ -//////////////////////////////////////////////////////////////////////// -// -// MFillHStarMap -// -// This task fills a star map (a 2D histogram, MHStarMap) -// from the calculated hillas parameter (MHillas). -// The algorithm for this can be found in MHStarMap::Fill -// -//////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +// // +// MFillHStarMap // +// // +// This task fills a star map (a 2D histogram, MHStarMap) // +// from the calculated hillas parameter (MHillas). // +// The algorithm for this can be found in MHStarMap::Fill // +// // +// Input Containers: // +// MHillas // +// // +// Output Containers: // +// MHStarMap // +// // +////////////////////////////////////////////////////////////////////////////// #include "MFillHStarMap.h" @@ -40,5 +46,5 @@ #include "MParList.h" -ClassImp(MFillHStarMap) +ClassImp(MFillHStarMap); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MFillHStarMap.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillHStarMap.h (revision 858) +++ trunk/MagicSoft/Mars/mhist/MFillHStarMap.h (revision 859) @@ -14,20 +14,20 @@ class MHillas; -class MFillHStarMap : public MTask { - private: - MHillas *fEvt; - MHStarMap *fHistos ; +class MFillHStarMap : public MTask +{ +private: + const MHillas *fEvt; + MHStarMap *fHistos ; - public: - MFillHStarMap(const char *name=NULL, const char *title=NULL); +public: + MFillHStarMap(const char *name=NULL, const char *title=NULL); - Bool_t PreProcess(MParList *pList); - Bool_t Process(); - Bool_t PostProcess(); - - ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters + Bool_t PreProcess(MParList *pList); + Bool_t Process(); + Bool_t PostProcess(); + ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters }; - + #endif Index: trunk/MagicSoft/Mars/mhist/MHFadcCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHFadcCam.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHFadcCam.cc (revision 859) @@ -36,5 +36,5 @@ #include -ClassImp(MHFadcCam) +ClassImp(MHFadcCam); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MHFadcPix.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHFadcPix.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHFadcPix.cc (revision 859) @@ -37,5 +37,5 @@ #include -ClassImp(MHFadcPix) +ClassImp(MHFadcPix); // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhist/MHHillas.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHHillas.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHHillas.cc (revision 859) @@ -17,5 +17,5 @@ #include "MHillas.h" -ClassImp(MHHillas) +ClassImp(MHHillas); MHHillas::MHHillas (const char *name, const char *title) @@ -55,5 +55,5 @@ } -void MHHillas::Fill(MHillas *par) +void MHHillas::Fill(const MHillas *par) { fAlpha ->Fill(fabs(par->GetAlpha())); Index: trunk/MagicSoft/Mars/mhist/MHHillas.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHHillas.h (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHHillas.h (revision 859) @@ -25,5 +25,5 @@ ~MHHillas(); - void Fill(MHillas *par); + void Fill(const MHillas *par); TH1F *GetHistAlpha() { return fAlpha; } Index: trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 859) @@ -29,5 +29,5 @@ #include -ClassImp(MHMcCollectionArea) +ClassImp(MHMcCollectionArea); MHMcCollectionArea::MHMcCollectionArea(const char *name, const char *title) Index: trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc (revision 859) @@ -28,5 +28,5 @@ #include "MHMcEnergy.h" -ClassImp(MHMcEnergies) +ClassImp(MHMcEnergies); MHMcEnergies::MHMcEnergies(const UInt_t count, const char *name, const char *title) Index: trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc (revision 859) @@ -32,5 +32,5 @@ #include -ClassImp(MHMcEnergy) +ClassImp(MHMcEnergy); MHMcEnergy::MHMcEnergy(const UInt_t idx, const char *name, const char *title) Index: trunk/MagicSoft/Mars/mhist/MHStarMap.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 859) @@ -42,5 +42,5 @@ #include "MHillas.h" -ClassImp(MHStarMap) +ClassImp(MHStarMap); MHStarMap::MHStarMap (const char *name, const char *title) @@ -133,5 +133,5 @@ } -void MHStarMap::Fill(MHillas *par) +void MHStarMap::Fill(const MHillas *par) { const float dist = par->GetDist(); Index: trunk/MagicSoft/Mars/mhist/MHStarMap.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHStarMap.h (revision 858) +++ trunk/MagicSoft/Mars/mhist/MHStarMap.h (revision 859) @@ -27,5 +27,5 @@ ~MHStarMap(); - void Fill(MHillas *par); + void Fill(const MHillas *par); TH2F *GetHist() { return fStarMap; } Index: trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc (revision 858) +++ trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc (revision 859) @@ -28,4 +28,10 @@ // MMcThresholdCalc // // // +// Input Containers: // +// MMcEvt // +// // +// Output Containers: // +// MMcTrig;*, MHMcEnergy;* // +// // ///////////////////////////////////////////////////////////////////////////// @@ -52,6 +58,6 @@ *fTitle = title ? title : "Task to calculate the energy threshold from Monte Carlo"; - fMcTrig = new (MMcTrig*)[fDimension]; - fHMcEnergy = new (MHMcEnergy*)[fDimension]; + fMcTrig = new MMcTrig*[fDimension]; + fHMcEnergy = new MHMcEnergy*[fDimension]; fMustDelete = new Bool_t[fDimension]; @@ -75,6 +81,4 @@ // connect Monte Carlo data with this task - char auxname[15]="MMcTrig"; // string to write container names - fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt"); if (!fMcEvt) @@ -83,4 +87,6 @@ return kFALSE; } + + char auxname[15]="MMcTrig"; // string to write container names for (unsigned int i=0; i