Changeset 466 for trunk/MagicSoft
- Timestamp:
- 01/12/01 14:48:35 (24 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 added
- 1 deleted
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r463 r466 1 1 -*-*- END -*-*- 2 2000/01/12: Thomas Bretz 3 4 * MLinkDef.h, MIncl.h, marslogo.xpm, magiclogo.xpm: 5 - added 6 * LinkDef.h: 7 - removed 8 9 * Makefile: 10 - Added CINT, mrproper 11 12 * mbase/Makefile, mraw/Makefile, mgui/Makefile, mdatacheck/Makefile: 13 - included makefile.general, Makefile.rules, 14 - removes corresponding lines 15 16 * mdatacheck/MDumpEvtHeader.[h,cc], mdatacheck/MFillAdcSpect.[cc,h], 17 mdatacheck/MFillAdcSpect.[h,cc], mdatacheck/MGDisplayAdc.[cc,h], 18 mdatacheck/MHistsosAdc.[h,cc], mdatacheck.MShowSpect.[cc,h] 19 - changed include statements 20 21 * mgui/MGDataCheckMain.[cc,h], mgui/MGMarsMain.[cc,h] 22 - changed include statements 23 - move enum from h to cc 24 - removed comma operator from delete statements (nonsense) 25 26 2 27 2001/01/11: Harald Kornmayer 3 28 4 29 * ./: 5 readraw.c , Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc,30 readraw.cc, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc, 6 31 MReadTree.h, mbase/Makefile, mraw/Makefile 7 - small changes in this files. Not really critical.32 - small changes in this files. Not really critical. 8 33 9 34 mars.cc 10 - added the main file for the gui35 - added the main file for the gui 11 36 12 37 mgui/ 13 38 GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc, 14 39 Makefile, MGDataCheckMain.h 15 - added the subdir mgui and this files40 - added the subdir mgui and this files 16 41 17 42 mdatacheck/ … … 20 45 MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h, 21 46 MGDisplayAdc.cc, MGDisplayAdc.h, Makefile 22 - added the subdir mdatacheck and this files 47 - added the subdir mdatacheck and this files 48 23 49 24 50 2000/12/28: Thomas Bretz … … 32 58 * MLoopEvt.cc, MLoopEvt.h: 33 59 - Removed 60 34 61 35 62 2000/12/22 - Thomas Bretz: -
trunk/MagicSoft/Mars/Makefile
r463 r466 24 24 PROGRAMS = merpp readraw mars 25 25 SOLIB = mars.so 26 CINT = M 26 27 27 28 # … … 58 59 59 60 # Use $(CXX) -v ... for a more verbose output 60 $(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o 61 $(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o 61 62 @echo " Linking $@ ..." 62 63 $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@ … … 88 89 89 90 90 MCint.cc: $(HEADERS)91 @echo "Generating dictionary MCint.cc..."92 @$(ROOTSYS)/bin/rootcint -f MCint.cc \93 -c $(INCLUDES) $(HEADERS) LinkDef.h94 95 91 include Makefile.rules 96 92 97 93 clean: rmlib rmcint rmobjs rmcore rmbin 98 94 99 # @endcode 95 mrproper: clean rmbak 96 @rm -f macros/*~ 97 @rm -rf htmldoc 98 @echo "cd mbase" 99 @cd mbase; make mrproper; cd .. 100 @echo "cd .." 101 @echo "cd mraw" 102 @cd mraw; make mrproper; cd .. 103 @echo "cd .." 104 @echo "cd mgui" 105 @cd mgui; make mrproper; cd .. 106 @echo "cd .." 107 @echo "cd mdatacheck" 108 @cd mdatacheck; make mrproper; cd .. 109 @echo "cd .." 100 110 101 111 102 103 # DO NOT DELETE 104 105 112 # @endcode -
trunk/MagicSoft/Mars/NEWS
r465 r466 1 1 -*-*- END -*-*- 2 2001/01/11: 2 2001/01/11: 3 3 4 4 * First Implementation of a Gui to read the raw data. Start the 5 5 gui with the command mars. 6 6 7 8 7 9 xxxx/yy/zz:8 2000/12/28: 10 9 11 10 * First official release 0.1 -
trunk/MagicSoft/Mars/mbase/Makefile
r463 r466 15 15 # 16 16 # 17 INCLUDEMK =../Makefile.conf.$(OSTYPE)18 include $(INCLUDEMK)17 include ../Makefile.conf.$(OSTYPE) 18 include ../Makefile.conf.general 19 19 20 20 # @endcode 21 21 22 INCLUDES = -I. 23 22 24 # @code 23 25 24 LIB = libmbase.a 25 26 # 27 # connect the include files defined in the config.mk file 28 # 29 INCLUDES = -I./ 30 31 # 32 # ----->>> root libraries 33 # 34 35 ROOTLIBS = `root-config --libs` 36 ROOTGLIBS = `root-config --glibs` 37 ROOTCFLAGS = `root-config --cflags` 38 39 # 40 # compiler flags 41 # 42 43 CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) 44 CFLAGS = $(CXXFLAGS) 45 FFLAGS = $(CXXFLAGS) 26 CINT = Base 27 LIB = libmbase.a 46 28 47 29 #------------------------------------------------------------------------------ 48 30 49 #.SILENT:50 51 31 .SUFFIXES: .c .cc .cxx .h .hxx .o 52 53 32 54 33 SRCFILES = MTask.cc \ … … 72 51 all: $(LIB) 73 52 74 depend: 75 @makedepend $(SRCS) $(INCLUDES) $(ROOTCFLAGS) \ 76 -fMakefile.depend 2> kk.kk ; cat kk.kk 53 include ../Makefile.rules 77 54 78 $(LIB): $(OBJS) BaseCint.o 79 @echo " - Building Library $(LIB) ... " 80 $(AR) $(LIB) *.o 55 clean: rmlib rmcint rmobjs rmcore 81 56 82 BaseCint.cc: $(HEADERS) 83 @echo 84 @echo " - Generating dictionary BaseCint.cc ..." 85 86 $(ROOTSYS)/bin/rootcint -f BaseCint.cc \ 87 -c $(INCLUDES) $(HEADERS) BaseIncl.h BaseLinkDef.h 88 89 .cxx.o: 90 @echo " - Compiling " $< 91 $(CXX) $(CXXFLAGS) -c $< -o $@ 92 93 .cc.o: 94 @echo " - Compiling " $< 95 $(CXX) $(CXXFLAGS) -c $< -o $@ 96 97 .c.o: 98 @echo " - Compiling " $< 99 $(CC) $(CFLAGS) -c $< -o $@ 100 101 # 102 # The cleaning facility 103 # 104 105 rmlib: 106 @echo "Removing libraries..." 107 @rm -f lib*.a 108 109 rmcint: 110 @echo "Removing cint-stuff..." 111 @rm -f BaseCint.* 112 113 rmobjs: 114 @echo "Removing object files..." 115 @rm -f *.o 116 117 rmbin: 118 @echo "Removing binary files..." 119 @rm -f core 120 121 122 clean: rmlib rmcint rmobjs rmbin 123 124 mrproper: clean 125 @echo "Removing *~ kk.kk html/..." 126 @rm -f *~ kk.kk 127 128 cflags: 129 @echo $(INCLUDES) $(CXXFLAGS) 57 mrproper: clean rmbak 130 58 131 59 # @endcode -
trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc
r462 r466 1 1 #include "MDumpEvtHeader.h" 2 3 #include "MParList.h" 4 #include "MRawEvtHeader.h" 5 #include "MRawEvtPixelIter.h" 2 6 3 7 //ClassImp(MDumpEvtHeader) -
trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.h
r462 r466 1 1 #ifndef MDUMPEVTHEADER_H 2 2 #define MDUMPEVTHEADER_H 3 4 #ifndef MAGIC_h 5 #include "MAGIC.h" 6 #endif 3 7 4 8 #ifndef MTASK_H … … 6 10 #endif 7 11 8 #include "MParList.h" 9 #include <TSystem.h> 10 11 #include "MRawEvtHeader.h" 12 #include "MRawEvtData.h" 13 #include "MRawEvtPixelIter.h" 12 class MRawEvtHeader; 13 class MRawEvtData; 14 class MRawEvtPixelIter; 15 class MParList; 14 16 15 17 class MDumpEvtHeader : public MTask { -
trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc
r462 r466 1 1 #include "MFillAdcSpect.h" 2 3 #include <iostream.h> 4 5 #include "MParList.h" 6 #include "MHistosAdc.h" 7 #include "MRawEvtData.h" 8 #include "MRawEvtPixelIter.h" 2 9 3 10 //ClassImp(MFillAdcSpect) … … 7 14 *fName = name ? name : "MFillAdcSpect"; 8 15 *fTitle = title ? title : "Task to fill the adc spectra with raw data"; 9 10 11 16 12 17 fRawEvtData = NULL ; -
trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.h
r462 r466 1 1 #ifndef MFILLADCSPECT_H 2 2 #define MFILLADCSPECT_H 3 4 #ifndef MAGIC_H 5 #include "MAGIC.h" 6 #endif 3 7 4 8 #ifndef MTASK_H … … 6 10 #endif 7 11 8 #include "MParList.h" 9 #include <TSystem.h> 10 11 #include "MRawEvtHeader.h" 12 #include "MRawEvtData.h" 13 #include "MRawEvtPixelIter.h" 14 #include "MHistosAdc.h" 12 class MParList; 13 class MHistosAdc; 14 class MRawEvtData; 15 class MRawEvtPixelIter; 15 16 16 17 class MFillAdcSpect : public MTask { -
trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc
r462 r466 1 2 1 #include "MGDisplayAdc.h" 2 3 #include <TGListBox.h> // TGListBox 4 #include <TGButton.h> // TGTextButton 5 #include <TGSlider.h> // TGVSlider 6 #include <TCanvas.h> // TCanvas.h 7 #include <TGMsgBox.h> // TGMsgBox 8 #include <TRootEmbeddedCanvas.h> // TRootEmbeddedCanvas 9 10 #include "MHistosAdc.h" 11 12 enum ComIdentDisplayAdc { 13 M_BUTTON_SAVE, 14 M_BUTTON_PRINT, 15 M_BUTTON_PRINTALL, 16 M_BUTTON_CLOSE , 17 18 M_BUTTON_PREV, 19 M_BUTTON_NEXT, 20 21 M_LIST_HISTO, 22 M_RADIO_HIGH, 23 M_RADIO_LOW, 24 M_RADIO_LH, 25 M_BUTTON_RESET, 26 M_VSId1 27 } ; 3 28 4 29 MGDisplayAdc::MGDisplayAdc ( MHistosAdc *Histos, … … 236 261 // 237 262 Int_t buttons = 4, retval = 0 ; 238 Char_t wort[100] ;239 Char_t extens[5] ;240 Char_t command[110] ;241 242 TGFileItem *item ; // to process items in the file view container243 void *np = NULL ; // null pointer263 //Char_t wort[100] ; 264 //Char_t extens[5] ; 265 //Char_t command[110] ; 266 267 //TGFileItem *item ; // to process items in the file view container 268 //void *np = NULL ; // null pointer 244 269 245 270 switch (GET_MSG(msg)) -
trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.h
r462 r466 2 2 #define MGDISPLAYADC_H 3 3 4 #include <iostream.h> 5 #include <TROOT.h> 6 #include <TApplication.h> 7 #include <TSystem.h> 8 #include <TGClient.h> 9 #include <TGButton.h> 10 #include <TGMenu.h> 11 #include <TGTab.h> 12 #include <TGListBox.h> 13 #include <TGPicture.h> 14 #include <TRootEmbeddedCanvas.h> 15 #include <TCanvas.h> 16 #include <TGFSContainer.h> 17 #include <TGMsgBox.h> 18 #include <TVirtualX.h> 19 #include <TGFrame.h> 20 #include <TGTextEntry.h> 21 #include <TGSlider.h> 22 #include <TGDoubleSlider.h> 23 #include <TGScrollBar.h> 24 #include <TSlider.h> 4 #ifndef ROOT_TFrame 5 #include <TGFrame.h> // TGTransientFrame 6 #endif 25 7 26 27 #include <TVirtualX.h> 28 #include <TGClient.h> 29 30 #include "MHistosAdc.h" 31 32 class MHistosAdc; 33 34 35 36 enum ComIdentDisplayAdc { 37 M_BUTTON_SAVE, 38 M_BUTTON_PRINT, 39 M_BUTTON_PRINTALL, 40 M_BUTTON_CLOSE , 41 42 M_BUTTON_PREV, 43 M_BUTTON_NEXT, 44 45 M_LIST_HISTO, 46 M_RADIO_HIGH, 47 M_RADIO_LOW, 48 M_RADIO_LH, 49 M_BUTTON_RESET, 50 M_VSId1 51 } ; 8 class MHistosAdc; 9 class TGListBox; 10 class TGTextButton; 11 class TRootEmbeddedCanvas; 12 class TCanvas; 13 class TGVSlider; 14 class TGRadioButton; 52 15 53 16 class MGDisplayAdc : public TGTransientFrame { -
trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.h
r462 r466 2 2 #define MHISTOSADC_H 3 3 4 #ifndef MAGIC_H 4 5 #include "MAGIC.h" 6 #endif 5 7 8 #ifndef ROOT_TObjArray 6 9 #include <TObjArray.h> 10 #endif 7 11 12 #ifndef MPARCONTAINER_H 8 13 #include "MParContainer.h" 14 #endif 9 15 10 16 class MHistosAdc : public MParContainer -
trunk/MagicSoft/Mars/mdatacheck/MShowSpect.cc
r462 r466 1 1 #include "MShowSpect.h" 2 2 3 #include <stdlib.h> 4 5 #include <TROOT.h> 6 #include <TApplication.h> 7 #include <TSystem.h> 8 #include <TGClient.h> 9 #include <TGFileDialog.h> 10 #include <TVirtualX.h> 11 12 #include "MParList.h" 13 #include "MHistosAdc.h" 3 #include "MParList.h" // MParList 4 #include "MGDisplayAdc.h" // MGDisplayAdc 14 5 15 6 -
trunk/MagicSoft/Mars/mdatacheck/MShowSpect.h
r462 r466 2 2 #define MSHOWSPECT_H 3 3 4 #ifndef MAGIC_H 4 5 #include "MAGIC.h" 6 #endif 5 7 8 #ifndef MTASK_H 6 9 #include "MTask.h" 7 # include "MGDisplayAdc.h"10 #endif 8 11 9 class MGDisplayAdc ; 10 12 class MGDisplayAdc; 11 13 class MHistosAdc; 12 class MHistosTdc;13 14 class MParList ; 14 15 -
trunk/MagicSoft/Mars/mgui/MGDataCheckMain.cc
r461 r466 14 14 15 15 ClassImp(MGDataCheckMain) 16 17 enum CommandDataChecker { 18 M_FILE_CLOSE , 19 M_BUTTON_PEDADC, 20 M_BUTTON_CRADC, 21 M_BUTTON_PEDTDC, 22 M_BUTTON_CRTDC, 23 24 M_PBUTTON_CDIR_UP, 25 M_PBUTTON_LIST_MODE, 26 M_PBUTTON_DETAIL_MODE 27 } ; 28 16 29 17 30 MGDataCheckMain::MGDataCheckMain(const TGWindow *p, const TGWindow *main, … … 188 201 { 189 202 //delete fPicCdup, fPicList, fPicDetail; 190 delete fLayTab, fLayMenuBar, fLayMenuItem; 191 delete fFileView; 192 delete fFileCont; 193 delete fCdup, fListMode, fDetail; 194 delete fDir ; 195 delete fTabF1b, fTabF1a, fTabF1; 196 delete fButPedADC, fButCrADC, fButPedTDC, fButCrTDC; 197 delete fTop3, fTop2, fTop1; 198 delete fTab; 199 delete fFrameTop, fFrameLow ; 200 delete fFileMenu; 201 delete fMenuBar; 203 delete fLayTab; 204 delete fLayMenuBar; 205 delete fLayMenuItem; 206 delete fFileView; 207 delete fFileCont; 208 delete fCdup; 209 delete fListMode; 210 delete fDetail; 211 delete fDir ; 212 delete fTabF1b; 213 delete fTabF1a; 214 delete fTabF1; 215 delete fButPedADC; 216 delete fButCrADC; 217 delete fButPedTDC; 218 delete fButCrTDC; 219 delete fTop3; 220 delete fTop2; 221 delete fTop1; 222 delete fTab; 223 delete fFrameTop; 224 delete fFrameLow; 225 delete fFileMenu; 226 delete fMenuBar; 202 227 203 228 } -
trunk/MagicSoft/Mars/mgui/MGDataCheckMain.h
r461 r466 22 22 class TGFileContainer; 23 23 class TGListView; 24 25 enum CommandDataChecker {26 M_FILE_CLOSE ,27 M_BUTTON_PEDADC,28 M_BUTTON_CRADC,29 M_BUTTON_PEDTDC,30 M_BUTTON_CRTDC,31 32 M_PBUTTON_CDIR_UP,33 M_PBUTTON_LIST_MODE,34 M_PBUTTON_DETAIL_MODE35 } ;36 37 24 38 25 class MGDataCheckMain : public TGTransientFrame { -
trunk/MagicSoft/Mars/mgui/MGMarsMain.cc
r464 r466 12 12 13 13 ClassImp(MGMarsMain) 14 15 enum CommandIdentifiers { 16 M_FILE_EXIT , 17 M_FILE_ABOUT , 18 19 M_PICTURE_MAGIC , 20 M_PICTURE_MARS , 21 22 M_BUTTON_EVTDISP , 23 M_BUTTON_DATACHECK , 24 M_BUTTON_ANALYSE , 25 M_BUTTON_MONTECARLO 26 } ; 27 14 28 15 29 MGMarsMain::MGMarsMain(const TGWindow *p, UInt_t w, UInt_t h) … … 125 139 { 126 140 127 delete fButLayout, fLayMenuBar, fLayMenuItem ; 128 delete fButEvtDisp, fButDataCheck, fButAnalys, fButMonteCarlo; 129 delete fPicMagic, fPicMars; 130 delete fTabF1, fTabF2; 131 delete fTab; 132 delete fLow, fTop; 133 delete fLineSep2, fLineSep; 134 delete fFileMenu; 135 delete fMenuBar; 141 delete fButLayout; 142 delete fLayMenuBar; 143 delete fLayMenuItem; 144 delete fButEvtDisp; 145 delete fButDataCheck; 146 delete fButAnalys; 147 delete fButMonteCarlo; 148 delete fPicMagic; 149 delete fPicMars; 150 delete fTabF1; 151 delete fTabF2; 152 delete fTab; 153 delete fLow; 154 delete fTop; 155 delete fLineSep2; 156 delete fLineSep; 157 delete fFileMenu; 158 delete fMenuBar; 136 159 } 137 160 // ====================================================================== -
trunk/MagicSoft/Mars/mgui/MGMarsMain.h
r461 r466 16 16 class TGPictureButton; 17 17 class TGHorizontal3DLine; 18 19 enum CommandIdentifiers {20 M_FILE_EXIT ,21 M_FILE_ABOUT ,22 23 M_PICTURE_MAGIC ,24 M_PICTURE_MARS ,25 26 M_BUTTON_EVTDISP ,27 M_BUTTON_DATACHECK ,28 M_BUTTON_ANALYSE ,29 M_BUTTON_MONTECARLO30 } ;31 32 18 33 19 class MGMarsMain : public TGMainFrame { -
trunk/MagicSoft/Mars/mraw/Makefile
r463 r466 6 6 # 7 7 ################################################################## 8 # @maintitle9 10 # @code11 12 #13 # please change all system depend values in the14 # config.mk.${OSTYPE} file15 #16 #17 8 include ../Makefile.conf.$(OSTYPE) 18 9 include ../Makefile.conf.general 19 10 20 # @endcode 11 # 12 # Handling name of the Root Dictionary Files 13 # 14 CINT = Raw 21 15 22 # @code 23 16 # 17 # Library name to creatre 18 # 24 19 LIB = libmraw.a 25 20 … … 29 24 INCLUDES = -I. -I../mbase 30 25 31 #32 # ----->>> root libraries33 #34 35 ROOTLIBS = `root-config --libs`36 ROOTGLIBS = `root-config --glibs`37 ROOTCFLAGS = `root-config --cflags`38 39 #40 # compiler flags41 #42 43 CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG)44 CFLAGS = $(CXXFLAGS)45 FFLAGS = $(CXXFLAGS)46 47 26 #------------------------------------------------------------------------------ 48 27 49 #.SILENT:50 51 28 .SUFFIXES: .c .cc .cxx .h .hxx .o 52 53 29 54 30 SRCFILES = MRawRunHeader.cc \ … … 61 37 MRawFileWrite.cc 62 38 63 64 65 39 SRCS = $(SRCFILES) 66 40 HEADERS = $(SRCFILES:.cc=.h) … … 71 45 all: $(LIB) 72 46 73 depend: 74 @makedepend $(SRCS) $(INCLUDES) $(ROOTCFLAGS) \ 75 -f../Makefile.depend 2> kk.kk ; cat kk.kk 47 include ../Makefile.rules 76 48 77 $(LIB): $(OBJS) RawCint.o 78 @echo " - Building Library $(LIB) ... " 79 $(AR) $(LIB) *.o 49 clean: rmlib rmcint rmobjs rmcore rmbin 80 50 81 RawCint.cc: $(HEADERS) 82 @echo 83 @echo " - Generating dictionary RawCint.cc ..." 84 85 $(ROOTSYS)/bin/rootcint -f RawCint.cc \ 86 -c $(INCLUDES) $(HEADERS) RawIncl.h RawLinkDef.h 87 88 .cxx.o: 89 @echo " - Compiling " $< 90 $(CXX) $(CXXFLAGS) -c $< -o $@ 91 92 .cc.o: 93 @echo " - Compiling " $< 94 $(CXX) $(CXXFLAGS) -c $< -o $@ 95 96 .c.o: 97 @echo " - Compiling " $< 98 $(CC) $(CFLAGS) -c $< -o $@ 99 100 # 101 # The cleaning facility 102 # 103 104 rmlib: 105 @echo "Removing libraries..." 106 @rm -f lib*.a 107 108 rmcint: 109 @echo "Removing cint-stuff..." 110 @rm -f RawCint.* 111 112 rmobjs: 113 @echo "Removing object files..." 114 @rm -f *.o 115 116 rmbin: 117 @echo "Removing binary files..." 118 @rm -f core 119 120 121 clean: rmlib rmcint rmobjs rmbin 122 123 mrproper: clean 124 @echo "Removing *~ kk.kk html/..." 125 @rm -f *~ kk.kk 126 127 cflags: 128 @echo $(INCLUDES) $(CXXFLAGS) 51 mrproper: clean rmbak 129 52 130 53 # @endcode
Note:
See TracChangeset
for help on using the changeset viewer.