Merge pull request cms-sw#156 from nucleosynthesis/cherry-pick-from-slc6

Cherry picking commit to SLC6 branch
gdimperi · Nov 18, 2014 · 518c4d1 · 518c4d1
2 parents 84d3d5a + af25ad1
commit 518c4d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/interface/VerticalInterpHistPdf.h b/interface/VerticalInterpHistPdf.h
@@ -285,6 +285,7 @@ class FastVerticalInterpHistPdf2Base : public RooAbsPdf {
 
   // initialize the morphParams and the sentry. to be called by the daughter class, sets also _initBase to true
   void initBase() const ; 
+  virtual Bool_t  importWorkspaceHook(RooWorkspace& ws);
 
 private:
   ClassDef(FastVerticalInterpHistPdf2Base,1) // 

diff --git a/src/VerticalInterpHistPdf.cc b/src/VerticalInterpHistPdf.cc
@@ -747,6 +747,12 @@ FastVerticalInterpHistPdf2Base::FastVerticalInterpHistPdf2Base(const FastVertica
 }
 
 
+Bool_t FastVerticalInterpHistPdf2Base::importWorkspaceHook(RooWorkspace& ws) {
+  _initBase = false;
+  _morphParams.clear();
+  _sentry.reset();
+  return kFALSE;
+}
 
 
 //_____________________________________________________________________________