Instructions & makefile to build SVfit w/o CMSSW FW

Author: ktht

.gitignore

@@ -1 +1,5 @@
 *~
+exec/
+dep/
+obj/
+lib/

Makefile

@@ -0,0 +1,67 @@
+CXX      = g++
+
+WFLAGS   = -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter -Wno-vla
+CXXFLAGS = $(WFLAGS) -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 \
+           -Xassembler --compress-debug-sections -fno-crossjumping -msse3 -felide-constructors -fmessage-length=0 \
+           -fdiagnostics-show-option -pipe -fPIC $(shell root-config --cflags)
+
+LDFLAGS  = -flto
+
+ifdef DEBUG
+  CXXFLAGS += -Og -ggdb3
+else
+  CXXFLAGS += -O3 -ggdb0
+  LDFLAGS  += -s
+endif
+
+BASEDIR = TauAnalysis/ClassicSVfit
+
+SOURCE_PATH = $(BASEDIR)/src
+BIN_PATH    = $(BASEDIR)/bin
+
+OBJ_PATH  = $(BASEDIR)/obj
+DEP_PATH  = $(BASEDIR)/dep
+LIB_PATH  = $(BASEDIR)/lib
+EXEC_PATH = $(BASEDIR)/exec
+
+SRC_EXT = cc
+OBJ_EXT = o
+DEP_EXT = d
+LIB_EXT = so
+
+INCLUDES = -I.
+LIBS     = $(shell root-config --libs) -lGenVector
+
+SRCS          = $(shell find $(SOURCE_PATH) -name '*.$(SRC_EXT)' -exec basename {} \;)
+OBJS          = $(SRCS:%.$(SRC_EXT)=$(OBJ_PATH)/%.$(OBJ_EXT))
+DEPS          = $(SRCS:%.$(SRC_EXT)=$(DEP_PATH)/%.$(DEP_EXT))
+TRGT_SRCS     = $(shell find $(BIN_PATH) -name '*.$(SRC_EXT)' -exec basename {} \;)
+TRGT_OBJS     = $(TRGT_SRCS:%.$(SRC_EXT)=$(OBJ_PATH)/%.$(OBJ_EXT))
+TRGT          = $(TRGT_SRCS:%.$(SRC_EXT)=$(EXEC_PATH)/%)
+TRGT_LIB_BASE = $(subst /,_,$(BASEDIR))
+TRGT_LIB_PATH = $(LIB_PATH)/lib$(TRGT_LIB_BASE).$(LIB_EXT)
+
+all: $(TRGT)
+
+$(TRGT): $(EXEC_PATH)/%: $(OBJ_PATH)/%.$(OBJ_EXT) $(TRGT_LIB_PATH)
+	@mkdir -p $(EXEC_PATH)
+	@$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS) -l$(TRGT_LIB_BASE)
+
+$(TRGT_LIB_PATH): $(OBJS)
+	@mkdir -p $(LIB_PATH)
+	@$(CXX) $(CXXFLAGS) -shared $^ -o $@ $(LDFLAGS) $(LIBS)
+
+$(OBJ_PATH)/%.$(OBJ_EXT): $(SOURCE_PATH)/%.$(SRC_EXT)
+	@mkdir -p $(@D)
+	@mkdir -p $(DEP_PATH)
+	@$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MF $(patsubst $(OBJ_PATH)/%.$(OBJ_EXT),$(DEP_PATH)/%.$(DEP_EXT),$@) -c $< -o $@
+
+$(OBJ_PATH)/%.$(OBJ_EXT): $(BIN_PATH)/%.$(SRC_EXT)
+	@mkdir -p $(@D)
+	@mkdir -p $(DEP_PATH)
+	@$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MF $(patsubst $(OBJ_PATH)/%.$(OBJ_EXT),$(DEP_PATH)/%.$(DEP_EXT),$@) -c $< -o $@
+
+.PHONY: clean
+
+clean:
+	@rm -rf $(OBJ_PATH) $(DEP_PATH) $(EXEC_PATH)

README.md

@@ -21,6 +21,31 @@ scram b -j 4
 In case of compilation problems, please sutmitt an issue on
 https://github.com/SVfit/ClassicSVfit/issues
 
+# Without CMSSW software
+
+It is possible to build the software without CMSSW framework if the following prerequisites are satisfied (oldest software version the instructions were tested with):
+- ROOT (6.10/3 or newer)
+- GCC (6.3 or newer)
+
+In order to build the software, please execute the following lines in any directory with write access:
+```bash
+git clone https://github.com/SVfit/ClassicSVfit TauAnalysis/ClassicSVfit
+make -f TauAnalysis/ClassicSVfit/Makefile -j4
+```
+
+The test executables will be placed to `$PWD/TauAnalysis/ClassicSVfit/exec`. In order to use them:
+```bash
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/TauAnalysis/ClassicSVfit/lib
+
+# either enter the full path to the executable, e.g.
+./TauAnalysis/ClassicSVfit/exec/testClassicSVfit
+
+# or make the executable available globally
+export PATH=$PATH:$PWD/TauAnalysis/ClassicSVfit/exec
+testClassicSVfit # run anywhere
+```
+You can add the export statements to your `$HOME/.bashrc` to make their effect permanent.
+
 # Running instructions
 
 - [Presentation, slides 2+3](https://indico.cern.ch/event/684622/contributions/2807248/attachments/1575090/2487044/presentation_tmuller.pdf)

interface/MeasuredTauLepton.h

@@ -121,6 +121,6 @@ namespace classic_svFit
   {
     bool operator() (const MeasuredTauLepton& measuredTauLepton1, const MeasuredTauLepton& measuredTauLepton2);
   };
-};
+}
 
 #endif

src/ClassicSVfitIntegrand.cc

@@ -111,10 +111,14 @@ double ClassicSVfitIntegrand::EvalPS(const double* q) const
     return 0.; 
   }
 
+  double visPtShift1 = 1.;
+  double visPtShift2 = 1.;
+#ifdef USE_SVFITTF
   int idx_visPtShift1 = legIntegrationParams_[0].idx_VisPtShift_;
-  double visPtShift1 = ( useHadTauTF_ && idx_visPtShift1 != -1 && !leg1isLeptonicTauDecay_ ) ? (1./x_[idx_visPtShift1]) : 1.;
   int idx_visPtShift2 = legIntegrationParams_[1].idx_VisPtShift_;
-  double visPtShift2 = ( useHadTauTF_ && idx_visPtShift2 != -1 && !leg2isLeptonicTauDecay_ ) ? (1./x_[idx_visPtShift2]) : 1.;
+  if( useHadTauTF_ && idx_visPtShift1 != -1 && !leg1isLeptonicTauDecay_ ) visPtShift1 = (1./x_[idx_visPtShift1]);
+  if( useHadTauTF_ && idx_visPtShift2 != -1 && !leg2isLeptonicTauDecay_ ) visPtShift2 = (1./x_[idx_visPtShift2]);
+#endif
   if ( visPtShift1 < 1.e-2 || visPtShift2 < 1.e-2 ) return 0.;
 
   // scale momenta of visible tau decays products