Fork me on GitHub

Changeset ef97f2a in git


Ignore:
Timestamp:
Aug 9, 2018, 10:07:29 PM (6 years ago)
Author:
GitHub <noreply@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
c473838
Parents:
edeb0f0 (diff), 71efbfe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Pavel Demin <pavel-demin@…> (08/09/18 22:07:29)
git-committer:
GitHub <noreply@…> (08/09/18 22:07:29)
Message:

Merge pull request #61 from chekanov/master

Includes reader DelphesProIO for ProIO data format

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    redeb0f0 ref97f2a  
    3232endif
    3333
     34
     35# check consistency
     36ifneq ($(PROMC),)
     37  ifneq ($(PROIO),)
     38  $(error Attention:  PROMC and PROIO env. variables are set simultaneously. You cannot compile ProMC and ProIO readers in one compilation process due to an inconsistency in protocol buffers libraries. The suggestion is to compile these two readers in two steps. First unset PROIO variable and then \"configure; make\". After this, unset PROMC, set PROIO,  and run \"configure; make\". During runs, make sure shared libraries are set correctly. )
     39  endif
     40endif
     41
     42
    3443ifneq ($(PROMC),)
    3544HAS_PROMC = true
     45$(info ProMC event reader is requested)
    3646CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
    3747OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     48endif
     49
     50ifneq ($(PROIO),)
     51HAS_PROIO = true
     52$(info ProIO reader is requested)
     53       ifeq ($(PROTOBUF),)
     54       $(error but PROTOBUF variable is not set.)
     55       endif
     56
     57       PROTOBUF_FILE=$(PROTOBUF)/lib/libprotobuf.a
     58       ifeq ("$(wildcard $(PROTOBUF_FILE))","")
     59          $(error PROTOBUF variable is set, but it does not point to valid $(PROTOBUF_FILE))
     60       endif
     61
     62       ifeq ($(LZ4),)
     63            $(error but LZ4 variable is not set.)                       
     64       endif
     65       LZ4_FILE=$(LZ4)/lib/liblz4.so
     66       ifeq ("$(wildcard $(LZ4_FILE))","")
     67            $(error LZ4 variable is set,  but it  does not point to valid $(LZ4_FILE))
     68       endif
     69
     70
     71CXXFLAGS += -I$(PROIO)/include -I$(PROTOBUF)/include -I$(LZ4)/include -I$(PROIO)/src
     72OPT_LIBS += -L$(PROTOBUF)/lib -lprotobuf -L$(PROIO)/lib -lproio -lproio.pb -lz -L$(LZ4)/lib -llz4
    3873endif
    3974
     
    284319EXECUTABLE_OBJ +=  \
    285320        tmp/readers/DelphesProMC.$(ObjSuf)
     321
     322endif
     323
     324ifeq ($(HAS_PROIO),true)
     325DelphesProIO$(ExeSuf): \
     326        tmp/readers/DelphesProIO.$(ObjSuf)
     327
     328tmp/readers/DelphesProIO.$(ObjSuf): \
     329        readers/DelphesProIO.cpp \
     330        modules/Delphes.h \
     331        classes/DelphesStream.h \
     332        classes/DelphesClasses.h \
     333        classes/DelphesFactory.h \
     334        external/ExRootAnalysis/ExRootTreeWriter.h \
     335        external/ExRootAnalysis/ExRootTreeBranch.h \
     336        external/ExRootAnalysis/ExRootProgressBar.h
     337EXECUTABLE +=  \
     338        DelphesProIO$(ExeSuf)
     339
     340EXECUTABLE_OBJ +=  \
     341        tmp/readers/DelphesProIO.$(ObjSuf)
    286342
    287343endif
  • doc/genMakefile.tcl

    redeb0f0 ref97f2a  
    225225endif
    226226
     227
     228# check consistency
     229ifneq ($(PROMC),)
     230  ifneq ($(PROIO),)
     231  $(error Attention:  PROMC and PROIO env. variables are set simultaneously. You cannot compile ProMC and ProIO readers in one compilation process due to an inconsistency in protocol buffers libraries. The suggestion is to compile these two readers in two steps. First unset PROIO variable and then \"configure; make\". After this, unset PROMC, set PROIO,  and run \"configure; make\". During runs, make sure shared libraries are set correctly. )
     232  endif
     233endif
     234
     235
    227236ifneq ($(PROMC),)
    228237HAS_PROMC = true
     238$(info ProMC event reader is requested)
    229239CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
    230240OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     241endif
     242
     243ifneq ($(PROIO),)
     244HAS_PROIO = true
     245$(info ProIO reader is requested)
     246       ifeq ($(PROTOBUF),)
     247       $(error but PROTOBUF variable is not set.)
     248       endif
     249
     250       PROTOBUF_FILE=$(PROTOBUF)/lib/libprotobuf.a
     251       ifeq ("$(wildcard $(PROTOBUF_FILE))","")
     252          $(error PROTOBUF variable is set, but it does not point to valid $(PROTOBUF_FILE))
     253       endif
     254
     255       ifeq ($(LZ4),)
     256            $(error but LZ4 variable is not set.)                       
     257       endif
     258       LZ4_FILE=$(LZ4)/lib/liblz4.so
     259       ifeq ("$(wildcard $(LZ4_FILE))","")
     260            $(error LZ4 variable is set,  but it  does not point to valid $(LZ4_FILE))
     261       endif
     262
     263
     264CXXFLAGS += -I$(PROIO)/include -I$(PROTOBUF)/include -I$(LZ4)/include -I$(PROIO)/src
     265OPT_LIBS += -L$(PROTOBUF)/lib -lprotobuf -L$(PROIO)/lib -lproio -lproio.pb -lz -L$(LZ4)/lib -llz4
    231266endif
    232267
     
    272307puts {ifeq ($(HAS_PROMC),true)}
    273308executableDeps {readers/DelphesProMC.cpp}
     309puts {endif}
     310puts {}
     311
     312puts {ifeq ($(HAS_PROIO),true)}
     313executableDeps {readers/DelphesProIO.cpp}
    274314puts {endif}
    275315puts {}
Note: See TracChangeset for help on using the changeset viewer.