From 76d90fd1782a6e8af55435a73d64fd82fe88fa16 Mon Sep 17 00:00:00 2001 From: Philipp Schieferdecker Date: Tue, 10 Nov 2009 16:42:48 +0000 Subject: [PATCH] --- yaml --- r: 77567 b: "refs/heads/CMSSW_7_1_X" c: bf22ae5048a6c7baf31d0422d8f6a1b41b486862 h: "refs/heads/CMSSW_7_1_X" i: 77565: ce81ffdc447cab680159aa0e6f7555a3f73f58c1 77563: d5b7660b02920ef520d80ef3b475704fd0b8249b 77559: f3e2e5d77e8216a85451025b2866a08f761ee767 77551: ec454a3b1e750af5f03e7769a08b8ccbc22e3e20 77535: 761c6d20404c69979aec320bbaca1d4777fdbd3f 77503: 476bc24a9f339f4b292d1843f7603870def5cc36 77439: 57247fc698a7b1f07ecc3eb63abb7fdf19d1a52d 77311: 327d0c58d9bead0b3c7347a0f4934e51a8fae7b1 v: v3 --- [refs] | 2 +- trunk/CondFormats/JetMETObjects/ChangeLog | 7 +++ trunk/CondFormats/JetMETObjects/Makefile | 55 ++++++++++++++++++- .../FactorizedJetCorrector_linkdef.h | 8 +++ .../interface/JetCorrectorParameters.h | 9 +-- .../JetCorrectorParameters_linkdef.h | 10 ++++ .../interface/SimpleJetCorrector_linkdef.h | 8 +++ 7 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 trunk/CondFormats/JetMETObjects/interface/FactorizedJetCorrector_linkdef.h create mode 100644 trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters_linkdef.h create mode 100644 trunk/CondFormats/JetMETObjects/interface/SimpleJetCorrector_linkdef.h diff --git a/[refs] b/[refs] index fb258a065507c..59424fb4c1b1e 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 2e62006eba4c0eafae5001d10a18b9cd7afe561a +"refs/heads/CMSSW_7_1_X": bf22ae5048a6c7baf31d0422d8f6a1b41b486862 diff --git a/trunk/CondFormats/JetMETObjects/ChangeLog b/trunk/CondFormats/JetMETObjects/ChangeLog index 29de15588f54f..0853c5ccef7c2 100644 --- a/trunk/CondFormats/JetMETObjects/ChangeLog +++ b/trunk/CondFormats/JetMETObjects/ChangeLog @@ -1,3 +1,10 @@ +2009-11-10 Philipp Schieferdecker + + * added interface/*_linkdef.h files in order to enable Makefile to + build dictionaries in standalone mode. This allows one to + instantiate the classes e.g. in a ROOT macro after '.L + libJetMETObjects.so' + 2009-11-10 Philipp SCHIEFERDECKER * add getLepPt() and getRelLepPt() diff --git a/trunk/CondFormats/JetMETObjects/Makefile b/trunk/CondFormats/JetMETObjects/Makefile index 2428a601c3e97..6651a14a2dbd9 100644 --- a/trunk/CondFormats/JetMETObjects/Makefile +++ b/trunk/CondFormats/JetMETObjects/Makefile @@ -43,8 +43,11 @@ CXXFLAGS = -O3 -Wall -fPIC -DSTANDALONE -I. $(ROOTCXXFLAGS) ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) OBJS = $(TMPDIR)/JetCorrectorParameters.o \ + $(TMPDIR)/JetCorrectorParameters_dict.o \ $(TMPDIR)/SimpleJetCorrector.o \ - $(TMPDIR)/FactorizedJetCorrector.o + $(TMPDIR)/SimpleJetCorrector_dict.o \ + $(TMPDIR)/FactorizedJetCorrector.o \ + $(TMPDIR)/FactorizedJetCorrector_dict.o LIB = libJetMETObjects.so @@ -61,7 +64,13 @@ lib: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(ROOTLIBS) -o $(LIBDIR)/$(LIB) clean: - rm -rf $(OBJS) $(LIBDIR)/$(LIB) CondFormats + rm -rf $(OBJS) $(LIBDIR)/$(LIB) CondFormats \ + $(TMPDIR)/JetCorrectorParameters_dict.h \ + $(TMPDIR)/JetCorrectorParameters_dict.cc \ + $(TMPDIR)/SimpleJetCorrector_dict.h \ + $(TMPDIR)/SimpleJetCorrector_dict.cc \ + $(TMPDIR)/FactorizedJetCorrector_dict.h \ + $(TMPDIR)/FactorizedJetCorrector_dict.cc ################################################################################ @@ -73,13 +82,55 @@ $(TMPDIR)/JetCorrectorParameters.o: interface/JetCorrectorParameters.h \ $(CXX) $(CXXFLAGS) -c src/JetCorrectorParameters.cc \ -o $(TMPDIR)/JetCorrectorParameters.o +$(TMPDIR)/JetCorrectorParameters_dict.o: $(TMPDIR)/JetCorrectorParameters_dict.cc + $(CXX) $(CXXFLAGS) -I$(TMPDIR) -c $(TMPDIR)/JetCorrectorParameters_dict.cc \ + -o $(TMPDIR)/JetCorrectorParameters_dict.o + +$(TMPDIR)/JetCorrectorParameters_dict.cc: interface/JetCorrectorParameters.h \ + interface/JetCorrectorParameters_linkdef.h + rm -rf $(TMPDIR)/JetCorrectorParameters_dict.h + rm -rf $(TMPDIR)/JetCorrectorParameters_dict.cc + $(ROOTSYS)/bin/rootcint -f $(TMPDIR)/JetCorrectorParameters_dict.cc \ + -c -I$(TMPDIR) \ + interface/JetCorrectorParameters.h \ + interface/JetCorrectorParameters_linkdef.h + + + $(TMPDIR)/SimpleJetCorrector.o: interface/SimpleJetCorrector.h \ src/SimpleJetCorrector.cc $(CXX) $(CXXFLAGS) -c src/SimpleJetCorrector.cc \ -o $(TMPDIR)/SimpleJetCorrector.o +$(TMPDIR)/SimpleJetCorrector_dict.o: $(TMPDIR)/SimpleJetCorrector_dict.cc + $(CXX) $(CXXFLAGS) -I$(TMPDIR) -c $(TMPDIR)/SimpleJetCorrector_dict.cc \ + -o $(TMPDIR)/SimpleJetCorrector_dict.o + +$(TMPDIR)/SimpleJetCorrector_dict.cc: interface/SimpleJetCorrector.h \ + interface/SimpleJetCorrector_linkdef.h + rm -rf $(TMPDIR)/SimpleJetCorrector_dict.h + rm -rf $(TMPDIR)/SimpleJetCorrector_dict.cc + $(ROOTSYS)/bin/rootcint -f $(TMPDIR)/SimpleJetCorrector_dict.cc \ + -c -I$(TMPDIR) \ + interface/SimpleJetCorrector.h \ + interface/SimpleJetCorrector_linkdef.h + + + $(TMPDIR)/FactorizedJetCorrector.o: interface/FactorizedJetCorrector.h \ src/FactorizedJetCorrector.cc $(CXX) $(CXXFLAGS) -c src/FactorizedJetCorrector.cc \ -o $(TMPDIR)/FactorizedJetCorrector.o +$(TMPDIR)/FactorizedJetCorrector_dict.o: $(TMPDIR)/FactorizedJetCorrector_dict.cc + $(CXX) $(CXXFLAGS) -I$(TMPDIR) -c $(TMPDIR)/FactorizedJetCorrector_dict.cc \ + -o $(TMPDIR)/FactorizedJetCorrector_dict.o + +$(TMPDIR)/FactorizedJetCorrector_dict.cc: interface/FactorizedJetCorrector.h \ + interface/FactorizedJetCorrector_linkdef.h + rm -rf $(TMPDIR)/FactorizedJetCorrector_dict.h + rm -rf $(TMPDIR)/FactorizedJetCorrector_dict.cc + $(ROOTSYS)/bin/rootcint -f $(TMPDIR)/FactorizedJetCorrector_dict.cc \ + -c -I$(TMPDIR) \ + interface/FactorizedJetCorrector.h \ + interface/FactorizedJetCorrector_linkdef.h diff --git a/trunk/CondFormats/JetMETObjects/interface/FactorizedJetCorrector_linkdef.h b/trunk/CondFormats/JetMETObjects/interface/FactorizedJetCorrector_linkdef.h new file mode 100644 index 0000000000000..271686e9af21d --- /dev/null +++ b/trunk/CondFormats/JetMETObjects/interface/FactorizedJetCorrector_linkdef.h @@ -0,0 +1,8 @@ +#ifdef __CINT__ +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; +#pragma link C++ nestedclasses; + +#pragma link C++ class FactorizedJetCorrector+; +#endif // __CINT__ diff --git a/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters.h b/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters.h index e157008c75870..39bcfe2010472 100644 --- a/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters.h +++ b/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters.h @@ -1,6 +1,6 @@ // // Original Author: Fedor Ratnikov Nov 9, 2007 -// $Id: JetCorrectorParameters.h,v 1.2 2009/11/09 11:50:18 kkousour Exp $ +// $Id: JetCorrectorParameters.h,v 1.3 2009/11/09 20:08:42 kkousour Exp $ // // Generic parameters for Jet corrections // @@ -68,7 +68,8 @@ class JetCorrectorParameters //-------- Constructors -------------- JetCorrectorParameters() {} JetCorrectorParameters(const std::string& fFile, const std::string& fSection = ""); - JetCorrectorParameters(const Definitions& fDefinitions, const std::vector& fRecords) + JetCorrectorParameters(const JetCorrectorParameters::Definitions& fDefinitions, + const std::vector& fRecords) : mDefinitions(fDefinitions),mRecords(fRecords) {} //-------- Member functions ---------- const Record& record(unsigned fBin) const {return mRecords[fBin]; } @@ -83,8 +84,8 @@ class JetCorrectorParameters private: //-------- Member variables ---------- - Definitions mDefinitions; - std::vector mRecords; + JetCorrectorParameters::Definitions mDefinitions; + std::vector mRecords; }; #endif diff --git a/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters_linkdef.h b/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters_linkdef.h new file mode 100644 index 0000000000000..4f2563960e3e9 --- /dev/null +++ b/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters_linkdef.h @@ -0,0 +1,10 @@ +#ifdef __CINT__ +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; +#pragma link C++ nestedclasses; + +#pragma link C++ class JetCorrectorParameters+; +#pragma link C++ class JetCorrectorParameters::Definitions+; +#pragma link C++ class JetCorrectorParameters::Record+; +#endif // __CINT__ diff --git a/trunk/CondFormats/JetMETObjects/interface/SimpleJetCorrector_linkdef.h b/trunk/CondFormats/JetMETObjects/interface/SimpleJetCorrector_linkdef.h new file mode 100644 index 0000000000000..f4580fd1e4f82 --- /dev/null +++ b/trunk/CondFormats/JetMETObjects/interface/SimpleJetCorrector_linkdef.h @@ -0,0 +1,8 @@ +#ifdef __CINT__ +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; +#pragma link C++ nestedclasses; + +#pragma link C++ class SimpleJetCorrector+; +#endif // __CINT__