Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 2799) +++ trunk/MagicSoft/Mars/Changelog (revision 2800) @@ -4,4 +4,35 @@ -*-*- END OF LINE -*-*- + + 2004/01/14: Thomas Bretz + + * Makefile: + - replaced old style Makefile.depend by directory specific + dependancy files + + * Makefile.rules: + - changed obsolete '.cc.o' style to newer style '%.o: %.c' + - added rule to make dependency files + - added rule to remove dependancy files. + - added rmdep as prerequisite to clean + - include dependency file + + * mbase/Makefile, mcalib/Makefile, mcamera/Makefile, + mdata/Makefile, mfileio/Makefile, mfilter/Makefile, + mgeom/Makefile, mgui/Makefile, mhbase/Makefile, + mhist/Makefile, mhistmc/Makefile, mimage/Makefile, + mmain/Makefile, mmc/Makefile, mmontecarlo/Makefile, + mpointing/Makefile, mranforest/Makefile, mraw/Makefile, + mreflector/Makefile, mreport/Makefile, mtemp/Makefile, + mtools/Makefile: + - removed clean-rule, use the one in Makefile.rules instead + + * mreport/Makefile, mreport/ReportLinkDef.h: + - added MReportHelp + + * mreport/MReportFileRead.cc: + - moved code from MReportHelp to new file + - removed usage of MRepoort class completely + Index: trunk/MagicSoft/Mars/Makefile =================================================================== --- trunk/MagicSoft/Mars/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/Makefile (revision 2800) @@ -88,5 +88,4 @@ include Makefile.rules -include Makefile.depend # @@ -103,4 +102,5 @@ $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(LIBS) $@.o $(MARS_LIB) -o $@ +# FOR CONVINIENCE CREATE Dep-file first! $(LIBRARIES): @echo " Creating lib$@:" @@ -123,7 +123,7 @@ @echo -clean: rmmake rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmdep rmcore rmlib -mrproper: $(MRPROPERS) rmmake rmbin rmbak rmbakmac rmhtml clean +mrproper: $(MRPROPERS) rmbin rmbak rmbakmac rmhtml clean @echo " Done." @echo " " @@ -135,11 +135,11 @@ # @gzip -9 ../mars.tar -Makefile.depend: - (! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \ - echo " Generating dependancies into Makefile.depend" && \ - makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \ - echo " ") || find -maxdepth 0 -true > /dev/null - -depend: Makefile.depend +#Makefile.depend: +# (! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \ +# echo " Generating dependancies into Makefile.depend" && \ +# makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \ +# echo " ") || find -maxdepth 0 -true > /dev/null +# +#depend: Makefile.depend # @endcode Index: trunk/MagicSoft/Mars/Makefile.rules =================================================================== --- trunk/MagicSoft/Mars/Makefile.rules (revision 2799) +++ trunk/MagicSoft/Mars/Makefile.rules (revision 2800) @@ -1,2 +1,3 @@ +include $(CINT)Dep.d $(LIB): $(OBJS) $(CINT)Cint.o @@ -11,13 +12,18 @@ -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h -.cxx.o: +%.d: + @echo " - Generating dependancies" $@ + $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) 2> /dev/null | \ + sed 's/^\(.*\).o:/$@ \1.o:/' > $@ + +%.o: %.cxx @echo " - Compiling" $< $(CXX) $(CXXFLAGS) -c $< -o $@ -.cc.o: +%.o: %.cc @echo " - Compiling" $< $(CXX) $(CXXFLAGS) -c $< -o $@ -.c.o: +%.o: %.c @echo " - Compiling" $< $(CC) $(CFLAGS) -c $< -o $@ @@ -26,8 +32,4 @@ # The cleaning facility # - -rmmake: - @echo " Removing Makefile.depend" - @rm -f Makefile.depend rmcint: @@ -43,4 +45,8 @@ @echo " Removing object files..." @rm -f *.o + +rmdep: + @echo " Removing dependency file..." + @rm -f *Dep.d rmcore: @@ -66,4 +72,6 @@ ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f +clean: rmcint rmobjs rmdep rmcore rmlib + cflags: @echo $(INCLUDES) $(CXXFLAGS) Index: trunk/MagicSoft/Mars/manalysis/Makefile =================================================================== --- trunk/MagicSoft/Mars/manalysis/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/manalysis/Makefile (revision 2800) @@ -24,5 +24,6 @@ INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \ -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage \ - -I../mhistmc -I../mfileio -I../mmain -I../mcalib + -I../mhistmc -I../mfileio -I../mmain -I../mcalib \ + -I../mpointing # mcalib: MGeomApply (MCalibrationCam) @@ -33,9 +34,10 @@ SRCFILES = MPedestalPix.cc \ MPedestalCam.cc \ + MPedPhotPix.cc \ + MPedPhotCam.cc \ MPedCalcPedRun.cc \ MMcPedestalCopy.cc \ MMcPedestalNSBAdd.cc \ MGeomApply.cc \ - MCurrents.cc \ MCameraData.cc \ MEnergyEst.cc \ @@ -82,7 +84,5 @@ MArrivalTimeCalc.cc \ MMcCalibrationCalc.cc \ - MSimulatedAnnealing.cc \ - MPedPhotCam.cc \ - MPedPhotPix.cc + MSimulatedAnnealing.cc SRCS = $(SRCFILES) Index: trunk/MagicSoft/Mars/mbase/Makefile =================================================================== --- trunk/MagicSoft/Mars/mbase/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mbase/Makefile (revision 2800) @@ -77,8 +77,7 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak # @endcode - Index: trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- trunk/MagicSoft/Mars/mcalib/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mcalib/Makefile (revision 2800) @@ -55,5 +55,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mcamera/Makefile =================================================================== --- trunk/MagicSoft/Mars/mcamera/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mcamera/Makefile (revision 2800) @@ -49,5 +49,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mdata/Makefile =================================================================== --- trunk/MagicSoft/Mars/mdata/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mdata/Makefile (revision 2800) @@ -49,5 +49,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mfileio/Makefile =================================================================== --- trunk/MagicSoft/Mars/mfileio/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mfileio/Makefile (revision 2800) @@ -62,5 +62,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mfilter/Makefile =================================================================== --- trunk/MagicSoft/Mars/mfilter/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mfilter/Makefile (revision 2800) @@ -64,5 +64,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mgeom/Makefile =================================================================== --- trunk/MagicSoft/Mars/mgeom/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mgeom/Makefile (revision 2800) @@ -51,5 +51,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mgui/Makefile =================================================================== --- trunk/MagicSoft/Mars/mgui/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mgui/Makefile (revision 2800) @@ -41,5 +41,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mhbase/Makefile =================================================================== --- trunk/MagicSoft/Mars/mhbase/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mhbase/Makefile (revision 2800) @@ -46,5 +46,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mhist/Makefile =================================================================== --- trunk/MagicSoft/Mars/mhist/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mhist/Makefile (revision 2800) @@ -24,5 +24,5 @@ INCLUDES = -I. -I../mbase -I../mhbase -I../mraw -I../manalysis \ -I../mgui -I../mgeom -I../mdata -I../mfilter -I../mimage \ - -I../mmain -I../mmc -I../mreflector + -I../mmain -I../mmc -I../mreflector -I../mpointing #------------------------------------------------------------------------------ @@ -74,5 +74,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mhistmc/Makefile =================================================================== --- trunk/MagicSoft/Mars/mhistmc/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mhistmc/Makefile (revision 2800) @@ -52,5 +52,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mimage/Makefile =================================================================== --- trunk/MagicSoft/Mars/mimage/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mimage/Makefile (revision 2800) @@ -54,5 +54,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mmain/Makefile =================================================================== --- trunk/MagicSoft/Mars/mmain/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mmain/Makefile (revision 2800) @@ -52,5 +52,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mmontecarlo/Makefile =================================================================== --- trunk/MagicSoft/Mars/mmontecarlo/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mmontecarlo/Makefile (revision 2800) @@ -47,5 +47,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mpointing/Makefile =================================================================== --- trunk/MagicSoft/Mars/mpointing/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mpointing/Makefile (revision 2800) @@ -41,5 +41,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mranforest/Makefile =================================================================== --- trunk/MagicSoft/Mars/mranforest/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mranforest/Makefile (revision 2800) @@ -47,5 +47,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mraw/Makefile =================================================================== --- trunk/MagicSoft/Mars/mraw/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mraw/Makefile (revision 2800) @@ -50,5 +50,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mreflector/Makefile =================================================================== --- trunk/MagicSoft/Mars/mreflector/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mreflector/Makefile (revision 2800) @@ -43,5 +43,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mreport/MReportFileRead.cc =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportFileRead.cc (revision 2799) +++ trunk/MagicSoft/Mars/mreport/MReportFileRead.cc (revision 2800) @@ -42,5 +42,4 @@ #include -#include #include #include @@ -49,6 +48,6 @@ #include "MLogManip.h" -#include "MReport.h" #include "MParList.h" +#include "MReportHelp.h" ClassImp(MReportFileRead); @@ -58,78 +57,4 @@ const TString MReportFileRead::gsReportHeader ="[CC Report File]"; const TString MReportFileRead::gsVersionPrefix="Arehucas Version Number"; - -class MReportHelp : public TObject -{ -private: - MReport *fReport; - ULong_t fNumReports; - -public: - MReportHelp(const char *name, MLog *fLog) : fReport(NULL), fNumReports(0) - { - TClass *cls = gROOT->GetClass(name); - Int_t rc = 0; - if (!cls) - rc =1; - else - { - if (!cls->Property()) - rc = 5; - if (!cls->Size()) - rc = 4; - if (!cls->IsLoaded()) - rc = 3; - if (!cls->HasDefaultConstructor()) - rc = 2; - } - - if (rc) - { - *fLog << err << dbginf << "Cannot create new instance of class '" << name << "': "; - switch (rc) - { - case 1: - *fLog << "gROOT->GetClass() returned NULL." << endl; - return; - case 2: - *fLog << "no default constructor." << endl; - return; - case 3: - *fLog << "not loaded." << endl; - return; - case 4: - *fLog << "zero size." << endl; - return; - case 5: - *fLog << "no property." << endl; - return; - } - } - - // - // create the parameter container of the the given class type - // - fReport = (MReport*)cls->New(); - } - ~MReportHelp() { if (fReport) delete fReport; } - - const char *GetName() const { return fReport->GetIdentifier(); } - ULong_t GetNumReports() const { return fNumReports; } - ULong_t Hash() const { return fReport->GetIdentifier().Hash(); } - MReport *GetReport() { return fReport; } - //void SetTime(MTime *t) { fReport->SetTime(t); } - Int_t Interprete(TString &str, const MTime &start, const MTime &stop) - { - const Int_t rc = fReport->Interprete(str, start, stop); - - if (rc==kFALSE) - return kFALSE; - - fNumReports++; - return rc; - } - Bool_t SetupReading(MParList &plist) { return fReport->SetupReading(plist); } - void AddToList(MParList &plist) { plist.AddToList(fReport); } -}; // -------------------------------------------------------------------------- @@ -183,12 +108,11 @@ MReportHelp *help = new MReportHelp(name, fLog); - MReport *rep = NULL; - if (!(rep=help->GetReport())) - return kFALSE; - - if (GetReport(rep->GetIdentifier())) + if (!help->GetReport()) + return kFALSE; + + if (GetReport(help->GetName())) { *fLog << warn << "WARNING - Report with Identifier '"; - *fLog << rep->GetIdentifier() << "' already added to the list... "; + *fLog << help->GetName() << "' already added to the list... "; *fLog << "ignored." << endl; delete help; Index: trunk/MagicSoft/Mars/mreport/Makefile =================================================================== --- trunk/MagicSoft/Mars/mreport/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mreport/Makefile (revision 2800) @@ -33,4 +33,5 @@ MReportRun.cc \ MReportDAQ.cc \ + MReportHelp.cc \ MReportDrive.cc \ MReportCamera.cc \ @@ -49,5 +50,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mreport/ReportLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mreport/ReportLinkDef.h (revision 2799) +++ trunk/MagicSoft/Mars/mreport/ReportLinkDef.h (revision 2800) @@ -15,4 +15,5 @@ #pragma link C++ class MReportCurrents+; +#pragma link C++ class MReportHelp+; #pragma link C++ class MReportFileRead+; Index: trunk/MagicSoft/Mars/mtemp/Makefile =================================================================== --- trunk/MagicSoft/Mars/mtemp/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mtemp/Makefile (revision 2800) @@ -43,5 +43,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mtools/Makefile =================================================================== --- trunk/MagicSoft/Mars/mtools/Makefile (revision 2799) +++ trunk/MagicSoft/Mars/mtools/Makefile (revision 2800) @@ -50,5 +50,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak Index: trunk/MagicSoft/include-Classes/MMcFormat/Makefile =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/Makefile (revision 2799) +++ trunk/MagicSoft/include-Classes/MMcFormat/Makefile (revision 2800) @@ -52,5 +52,5 @@ include ../Makefile.rules -clean: rmcint rmobjs rmcore rmlib +#clean: rmcint rmobjs rmcore rmlib mrproper: clean rmbak