---

yaml --- r: 77567 b: "refs/heads/CMSSW_7_1_X" c: bf22ae5 h: "refs/heads/CMSSW_7_1_X" i: 77565: ce81ffd 77563: d5b7660 77559: f3e2e5d 77551: ec454a3 77535: 761c6d2 77503: 476bc24 77439: 57247fc 77311: 327d0c5 v: v3
cms-sw · Nov 10, 2009 · 76d90fd · 76d90fd
1 parent 5a04f57
commit 76d90fd
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 7 deletions.
diff --git 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
@@ -1,3 +1,10 @@
+2009-11-10  Philipp Schieferdecker  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* add getLepPt() and getRelLepPt()

diff --git 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
@@ -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
@@ -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<Record>& fRecords) 
+  JetCorrectorParameters(const JetCorrectorParameters::Definitions& fDefinitions,
+			 const std::vector<JetCorrectorParameters::Record>& 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<Record> mRecords;
+    JetCorrectorParameters::Definitions         mDefinitions;
+    std::vector<JetCorrectorParameters::Record> mRecords;
 };
 
 #endif
diff --git a/trunk/CondFormats/JetMETObjects/interface/JetCorrectorParameters_linkdef.h 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
@@ -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__