Fork me on GitHub

Changeset 00bcbe6 in git


Ignore:
Timestamp:
Apr 22, 2013, 10:00:46 PM (12 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
a817a22
Parents:
2013f0a
Message:

add make rule for event display

Files:
1 added
3 edited
4 moved

Legend:

Unmodified
Added
Removed

  • Makefile

    r2013f0a r00bcbe6  
    1717
    1818CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    19 LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
     19DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
     20DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
    2021
    2122###
    2223
    23 SHARED = libDelphes.$(DllSuf)
    24 SHAREDLIB = libDelphes.lib
     24DELPHES = libDelphes.$(DllSuf)
     25DELPHESLIB = libDelphes.lib
     26
     27DISPLAY = libDelphesDisplay.$(DllSuf)
     28DISPLAYLIB = libDelphesDisplay.lib
    2529
    2630VERSION = $(shell cat VERSION)
    … …  
    158162        classes/DelphesModule.h \
    159163        classes/DelphesFactory.h \
    160         classes/DelphesDisplay.h \
    161         classes/DelphesCaloData.h \
    162164        classes/SortableObject.h \
    163165        classes/DelphesClasses.h
    … …  
    196198        external/ExRootAnalysis/ExRootConfReader.h \
    197199        external/ExRootAnalysis/ExRootTask.h
    198 DICT =  \
     200DELPHES_DICT =  \
    199201        tmp/classes/ClassesDict.$(SrcSuf) \
    200202        tmp/modules/ModulesDict.$(SrcSuf) \
    201203        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
    202204
    203 DICT_OBJ =  \
     205DELPHES_DICT_OBJ =  \
    204206        tmp/classes/ClassesDict.$(ObjSuf) \
    205207        tmp/modules/ModulesDict.$(ObjSuf) \
    206208        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(ObjSuf)
    207209
    208 tmp/classes/DelphesDisplay.$(ObjSuf): \
    209         classes/DelphesDisplay.$(SrcSuf) \
    210         classes/DelphesDisplay.h
     210tmp/display/DisplayDict.$(SrcSuf): \
     211        display/DisplayLinkDef.h \
     212        display/DelphesDisplay.h \
     213        display/DelphesCaloData.h
     214DISPLAY_DICT =  \
     215        tmp/display/DisplayDict.$(SrcSuf)
     216
     217DISPLAY_DICT_OBJ =  \
     218        tmp/display/DisplayDict.$(ObjSuf)
     219
    211220tmp/classes/DelphesHepMCReader.$(ObjSuf): \
    212221        classes/DelphesHepMCReader.$(SrcSuf) \
    … …  
    251260        external/ExRootAnalysis/ExRootTreeWriter.h \
    252261        external/ExRootAnalysis/ExRootResult.h
    253 tmp/classes/DelphesCaloData.$(ObjSuf): \
    254         classes/DelphesCaloData.$(SrcSuf) \
    255         classes/DelphesCaloData.h
    256262tmp/classes/DelphesClasses.$(ObjSuf): \
    257263        classes/DelphesClasses.$(SrcSuf) \
    … …  
    723729        external/fastjet/ClusterSequence.hh \
    724730        external/fastjet/NNH.hh
    725 SOURCE_OBJ =  \
    726         tmp/classes/DelphesDisplay.$(ObjSuf) \
     731DELPHES_OBJ =  \
    727732        tmp/classes/DelphesHepMCReader.$(ObjSuf) \
    728733        tmp/classes/DelphesLHEFReader.$(ObjSuf) \
    … …  
    733738        tmp/classes/DelphesPileUpWriter.$(ObjSuf) \
    734739        tmp/classes/DelphesModule.$(ObjSuf) \
    735         tmp/classes/DelphesCaloData.$(ObjSuf) \
    736740        tmp/classes/DelphesClasses.$(ObjSuf) \
    737741        tmp/classes/DelphesPileUpReader.$(ObjSuf) \
    … …  
    839843        tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf)
    840844
     845tmp/display/DelphesDisplay.$(ObjSuf): \
     846        display/DelphesDisplay.$(SrcSuf) \
     847        display/DelphesDisplay.h
     848tmp/display/DelphesCaloData.$(ObjSuf): \
     849        display/DelphesCaloData.$(SrcSuf) \
     850        display/DelphesCaloData.h
     851DISPLAY_OBJ =  \
     852        tmp/display/DelphesDisplay.$(ObjSuf) \
     853        tmp/display/DelphesCaloData.$(ObjSuf)
     854
    841855tmp/external/tcl/tclObj.$(ObjSuf): \
    842856        external/tcl/tclObj.c
    … …  
    12001214###
    12011215
    1202 all: $(SHARED) $(EXECUTABLE) $(STDHEP_EXECUTABLE)
    1203 
    1204 $(SHARED): $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ)
     1216all: $(DELPHES) $(EXECUTABLE)
     1217
     1218display: $(DISPLAY)
     1219
     1220$(DELPHES): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
    12051221        @mkdir -p $(@D)
    12061222        @echo ">> Building $@"
    12071223ifeq ($(ARCH),aix5)
    1208         @$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
     1224        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
    12091225else
    12101226ifeq ($(PLATFORM),macosx)
    12111227# We need to make both the .dylib and the .so
    1212         @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
     1228        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    12131229ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
    12141230ifeq ($(MACOSX_MINOR),4)
    … …  
    12191235ifeq ($(PLATFORM),win32)
    12201236        @bindexplib $* $^ > $*.def
    1221         @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(SHAREDLIB)
    1222         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) $(OutPutOpt)$@
     1237        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DELPHESLIB)
     1238        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DELPHES_LIBS) $(OutPutOpt)$@
    12231239        @$(MT_DLL)
    12241240else
    1225         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
     1241        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    12261242        @$(MT_DLL)
    12271243endif
    … …  
    12291245endif
    12301246
     1247$(DISPLAY): $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ)
     1248        @mkdir -p $(@D)
     1249        @echo ">> Building $@"
     1250ifeq ($(ARCH),aix5)
     1251        @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^
     1252else
     1253ifeq ($(PLATFORM),macosx)
     1254# We need to make both the .dylib and the .so
     1255        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     1256ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     1257ifeq ($(MACOSX_MINOR),4)
     1258        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     1259endif
     1260endif
     1261else
     1262ifeq ($(PLATFORM),win32)
     1263        @bindexplib $* $^ > $*.def
     1264        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DISPLAYLIB)
     1265        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DISPLAY_LIBS) $(OutPutOpt)$@
     1266        @$(MT_DLL)
     1267else
     1268        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     1269        @$(MT_DLL)
     1270endif
     1271endif
     1272endif
     1273
    12311274clean:
    1232         @rm -f $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ) $(STDHEP_OBJ) core
     1275        @rm -f $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ) core
     1276        @rm -rf tmp
    12331277
    12341278distclean: clean
    1235         @rm -f $(SHARED) $(SHAREDLIB) $(EXECUTABLE)
     1279        @rm -f $(DELPHES) $(DELPHESLIB) $(DISPLAY) $(DISPLAYLIB) $(EXECUTABLE)
    12361280
    12371281dist:
    … …  
    12571301        @rm $@.arch $@.base
    12581302
    1259 $(SOURCE_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
     1303$(DELPHES_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
    12601304        @mkdir -p $(@D)
    12611305        @echo ">> Compiling $<"
    12621306        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
    12631307
    1264 $(DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
     1308$(DISPLAY_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
     1309        @mkdir -p $(@D)
     1310        @echo ">> Compiling $<"
     1311        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
     1312
     1313$(DELPHES_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
     1314        @mkdir -p $(@D)
     1315        @echo ">> Compiling $<"
     1316        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
     1317
     1318$(DISPLAY_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
    12651319        @mkdir -p $(@D)
    12661320        @echo ">> Compiling $<"
    … …  
    12771331        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
    12781332
    1279 $(EXECUTABLE): %$(ExeSuf): $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ)
     1333$(EXECUTABLE): %$(ExeSuf): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
    12801334        @echo ">> Building $@"
    1281         @$(LD) $(LDFLAGS) $^ $(LIBS) $(OutPutOpt)$@
     1335        @$(LD) $(LDFLAGS) $^ $(DELPHES_LIBS) $(OutPutOpt)$@
    12821336
    12831337###

  • classes/ClassesLinkDef.h

    r2013f0a r00bcbe6  
    1515#include "classes/DelphesFactory.h"
    1616
    17 #include "classes/DelphesDisplay.h"
    18 #include "classes/DelphesCaloData.h"
    19 
    2017#include "classes/SortableObject.h"
    2118#include "classes/DelphesClasses.h"
    … …  
    2926#pragma link C++ class DelphesModule+;
    3027#pragma link C++ class DelphesFactory+;
    31 
    32 #pragma link C++ class DelphesDisplay+;
    33 #pragma link C++ class DelphesCaloData+;
    3428
    3529#pragma link C++ class SortableObject+;

  • display/DelphesCaloData.cc

    r2013f0a r00bcbe6  
    11
    2 #include "classes/DelphesCaloData.h"
     2#include "display/DelphesCaloData.h"
    33
    44//------------------------------------------------------------------------------

  • display/DelphesDisplay.cc

    r2013f0a r00bcbe6  
    1717#include "TEveLegoEventHandler.h"
    1818
    19 #include "classes/DelphesDisplay.h"
     19#include "display/DelphesDisplay.h"
    2020
    2121//------------------------------------------------------------------------------

  • doc/genMakefile.tcl

    r2013f0a r00bcbe6  
    188188
    189189CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    190 LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
     190DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
     191DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
    191192
    192193###
    193194
    194 SHARED = libDelphes.$(DllSuf)
    195 SHAREDLIB = libDelphes.lib
     195DELPHES = libDelphes.$(DllSuf)
     196DELPHESLIB = libDelphes.lib
     197
     198DISPLAY = libDelphesDisplay.$(DllSuf)
     199DISPLAYLIB = libDelphesDisplay.lib
    196200
    197201VERSION = $(shell cat VERSION)
    … …  
    205209executableDeps
    206210
    207 dictDeps {DICT} {classes/*LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}
    208 
    209 sourceDeps {SOURCE} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc}
     211dictDeps {DELPHES_DICT} {classes/*LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}
     212
     213dictDeps {DISPLAY_DICT} {display/*LinkDef.h}
     214
     215sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc}
     216
     217sourceDeps {DISPLAY} {display/*.cc}
    210218
    211219tclDeps
    … …  
    217225###
    218226
    219 all: $(SHARED) $(EXECUTABLE) $(STDHEP_EXECUTABLE)
    220 
    221 $(SHARED): $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ)
     227all: $(DELPHES) $(EXECUTABLE)
     228
     229display: $(DISPLAY)
     230
     231$(DELPHES): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
    222232        @mkdir -p $(@D)
    223233        @echo ">> Building $@"
    224234ifeq ($(ARCH),aix5)
    225         @$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
     235        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
    226236else
    227237ifeq ($(PLATFORM),macosx)
    228238# We need to make both the .dylib and the .so
    229         @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
     239        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    230240ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
    231241ifeq ($(MACOSX_MINOR),4)
    … …  
    236246ifeq ($(PLATFORM),win32)
    237247        @bindexplib $* $^ > $*.def
    238         @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(SHAREDLIB)
    239         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) $(OutPutOpt)$@
     248        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DELPHESLIB)
     249        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DELPHES_LIBS) $(OutPutOpt)$@
    240250        @$(MT_DLL)
    241251else
    242         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
     252        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    243253        @$(MT_DLL)
    244254endif
    … …  
    246256endif
    247257
     258$(DISPLAY): $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ)
     259        @mkdir -p $(@D)
     260        @echo ">> Building $@"
     261ifeq ($(ARCH),aix5)
     262        @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^
     263else
     264ifeq ($(PLATFORM),macosx)
     265# We need to make both the .dylib and the .so
     266        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     267ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     268ifeq ($(MACOSX_MINOR),4)
     269        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     270endif
     271endif
     272else
     273ifeq ($(PLATFORM),win32)
     274        @bindexplib $* $^ > $*.def
     275        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DISPLAYLIB)
     276        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DISPLAY_LIBS) $(OutPutOpt)$@
     277        @$(MT_DLL)
     278else
     279        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     280        @$(MT_DLL)
     281endif
     282endif
     283endif
     284
    248285clean:
    249         @rm -f $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ) $(STDHEP_OBJ) core
     286        @rm -f $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ) core
     287        @rm -rf tmp
    250288
    251289distclean: clean
    252         @rm -f $(SHARED) $(SHAREDLIB) $(EXECUTABLE)
     290        @rm -f $(DELPHES) $(DELPHESLIB) $(DISPLAY) $(DISPLAYLIB) $(EXECUTABLE)
    253291
    254292dist:
    … …  
    274312        @rm $@.arch $@.base
    275313
    276 $(SOURCE_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
    277         @mkdir -p $(@D)
    278         @echo ">> Compiling $<"
    279         @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
    280 
    281 $(DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
     314$(DELPHES_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
     315        @mkdir -p $(@D)
     316        @echo ">> Compiling $<"
     317        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
     318
     319$(DISPLAY_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
     320        @mkdir -p $(@D)
     321        @echo ">> Compiling $<"
     322        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
     323
     324$(DELPHES_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
     325        @mkdir -p $(@D)
     326        @echo ">> Compiling $<"
     327        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
     328
     329$(DISPLAY_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
    282330        @mkdir -p $(@D)
    283331        @echo ">> Compiling $<"
    … …  
    294342        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
    295343
    296 $(EXECUTABLE): %$(ExeSuf): $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ)
     344$(EXECUTABLE): %$(ExeSuf): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
    297345        @echo ">> Building $@"
    298         @$(LD) $(LDFLAGS) $^ $(LIBS) $(OutPutOpt)$@
     346        @$(LD) $(LDFLAGS) $^ $(DELPHES_LIBS) $(OutPutOpt)$@
    299347
    300348###
Note: See TracChangeset for help on using the changeset viewer.