cms-analysis · skyriacoCMS · May 28, 2018 · May 29, 2018 · Jun 29, 2018 · Aug 5, 2018
diff --git a/interface/FastTemplate.h b/interface/FastTemplate.h
@@ -39,7 +39,7 @@ template <typename U> class FastHistoAxis_t {
   }
 
   int FindBin(const U& x) const{
-    if (x==binEdges_.at(size()-1) && size()>1) return (int)(size()-2);
+    if (x>=binEdges_.at(size()-1) && size()>1) return (int)(size()-2);
     auto bbegin = binEdges_.begin();
     auto bend = binEdges_.end();
     auto match = std::upper_bound(bbegin, bend, x);

diff --git a/interface/HZZ4L_RooSpinZeroPdf_1D_fast.h b/interface/HZZ4L_RooSpinZeroPdf_1D_fast.h
@@ -1,21 +1,16 @@
 #ifndef HZZ4L_ROOSPINZEROPDF_1D_FAST
 #define HZZ4L_ROOSPINZEROPDF_1D_FAST
 
-#include "RooAbsReal.h"
-#include "RooAbsPdf.h"
-#include "RooRealVar.h"
-#include "RooConstVar.h"
-#include "RooRealProxy.h"
-#include "RooListProxy.h"
+#include "HZZ4L_RooSpinZeroPdf_1D_fast_base.h"
 
+#include "RooRealProxy.h"
 
-class HZZ4L_RooSpinZeroPdf_1D_fast : public RooAbsPdf{
+class HZZ4L_RooSpinZeroPdf_1D_fast : public HZZ4L_RooSpinZeroPdf_1D_fast_base{
 protected:
   RooRealProxy fai1;
-
-  RooListProxy obsList; //  List of observables
-  RooListProxy coefList; //  List of pdf components
-
+  virtual double a1Val() const;
+  virtual double ai1Val() const;
+  virtual bool isAnomalousCouplingValueValid() const;
 public:
   HZZ4L_RooSpinZeroPdf_1D_fast();
   HZZ4L_RooSpinZeroPdf_1D_fast(
@@ -24,19 +19,11 @@ class HZZ4L_RooSpinZeroPdf_1D_fast : public RooAbsPdf{
     const RooArgList& inObsList,
     const RooArgList& inCoefList
     );
-
   HZZ4L_RooSpinZeroPdf_1D_fast(const HZZ4L_RooSpinZeroPdf_1D_fast& other, const char* name=0);
   virtual TObject* clone(const char* newname) const { return new HZZ4L_RooSpinZeroPdf_1D_fast(*this, newname); }
-  inline virtual ~HZZ4L_RooSpinZeroPdf_1D_fast(){}
-
-  Float_t interpolateFcn(Int_t code, const char* rangeName=0) const;
-  Double_t evaluate() const;
-  Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* rangeName=0) const;
-  Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;
 
 protected:
   ClassDef(HZZ4L_RooSpinZeroPdf_1D_fast, 1)
-
 };
- 
+
 #endif
diff --git a/interface/HZZ4L_RooSpinZeroPdf_1D_fast_a1ai.h b/interface/HZZ4L_RooSpinZeroPdf_1D_fast_a1ai.h
@@ -0,0 +1,30 @@
+#ifndef HZZ4L_ROOSPINZEROPDF_1D_FAST_A1AI
+#define HZZ4L_ROOSPINZEROPDF_1D_FAST_A1AI
+
+#include "HZZ4L_RooSpinZeroPdf_1D_fast_base.h"
+
+#include "RooRealProxy.h"
+
+class HZZ4L_RooSpinZeroPdf_1D_fast_a1ai : public HZZ4L_RooSpinZeroPdf_1D_fast_base{
+protected:
+  RooRealProxy a1, ai1;
+  virtual double a1Val() const;
+  virtual double ai1Val() const;
+  virtual bool isAnomalousCouplingValueValid() const;
+public:
+  HZZ4L_RooSpinZeroPdf_1D_fast_a1ai();
+  HZZ4L_RooSpinZeroPdf_1D_fast_a1ai(
+    const char *name, const char *title,
+    RooAbsReal& in_a1,
+    RooAbsReal& in_ai1,
+    const RooArgList& inObsList,
+    const RooArgList& inCoefList
+    );
+  HZZ4L_RooSpinZeroPdf_1D_fast_a1ai(const HZZ4L_RooSpinZeroPdf_1D_fast_a1ai& other, const char* name=0);
+  virtual TObject* clone(const char* newname) const { return new HZZ4L_RooSpinZeroPdf_1D_fast_a1ai(*this, newname); }
+
+protected:
+  ClassDef(HZZ4L_RooSpinZeroPdf_1D_fast_a1ai, 1)
+};
+
+#endif
diff --git a/interface/HZZ4L_RooSpinZeroPdf_1D_fast_base.h b/interface/HZZ4L_RooSpinZeroPdf_1D_fast_base.h
@@ -0,0 +1,38 @@
+#ifndef HZZ4L_ROOSPINZEROPDF_1D_FAST_BASE
+#define HZZ4L_ROOSPINZEROPDF_1D_FAST_BASE
+
+#include "RooAbsReal.h"
+#include "RooAbsPdf.h"
+#include "RooRealVar.h"
+#include "RooConstVar.h"
+#include "RooListProxy.h"
+
+
+class HZZ4L_RooSpinZeroPdf_1D_fast_base : public RooAbsPdf{
+protected:
+  RooListProxy obsList; //  List of observables
+  RooListProxy coefList; //  List of pdf components
+
+  virtual double a1Val() const = 0;
+  virtual double ai1Val() const = 0;
+  virtual bool isAnomalousCouplingValueValid() const = 0;
+
+public:
+  HZZ4L_RooSpinZeroPdf_1D_fast_base();
+  HZZ4L_RooSpinZeroPdf_1D_fast_base(
+    const char *name, const char *title,
+    const RooArgList& inObsList,
+    const RooArgList& inCoefList
+    );
+
+  HZZ4L_RooSpinZeroPdf_1D_fast_base(const HZZ4L_RooSpinZeroPdf_1D_fast_base& other, const char* name=0);
+  virtual TObject* clone(const char* newname) const = 0;
+  inline virtual ~HZZ4L_RooSpinZeroPdf_1D_fast_base(){}
+
+  Float_t interpolateFcn(Int_t code, const char* rangeName=0) const;
+  Double_t evaluate() const;
+  Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* rangeName=0) const;
+  Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;
+};
+
+#endif
diff --git a/interface/VVHZZ4L_RooSpinZeroPdf_1D_fast.h b/interface/VVHZZ4L_RooSpinZeroPdf_1D_fast.h
@@ -1,21 +1,16 @@
 #ifndef VVHZZ4L_ROOSPINZEROPDF_1D_FAST
 #define VVHZZ4L_ROOSPINZEROPDF_1D_FAST
 
-#include "RooAbsReal.h"
-#include "RooAbsPdf.h"
-#include "RooRealVar.h"
-#include "RooConstVar.h"
-#include "RooRealProxy.h"
-#include "RooListProxy.h"
+#include "VVHZZ4L_RooSpinZeroPdf_1D_fast_base.h"
 
+#include "RooRealProxy.h"
 
-class VVHZZ4L_RooSpinZeroPdf_1D_fast : public RooAbsPdf{
+class VVHZZ4L_RooSpinZeroPdf_1D_fast : public VVHZZ4L_RooSpinZeroPdf_1D_fast_base{
 protected:
   RooRealProxy fai1;
-
-  RooListProxy obsList; //  List of observables
-  RooListProxy coefList; //  List of pdf components
-
+  virtual double a1Val() const;
+  virtual double ai1Val() const;
+  virtual bool isAnomalousCouplingValueValid() const;
 public:
   VVHZZ4L_RooSpinZeroPdf_1D_fast();
   VVHZZ4L_RooSpinZeroPdf_1D_fast(
@@ -24,19 +19,11 @@ class VVHZZ4L_RooSpinZeroPdf_1D_fast : public RooAbsPdf{
     const RooArgList& inObsList,
     const RooArgList& inCoefList
     );
-
   VVHZZ4L_RooSpinZeroPdf_1D_fast(const VVHZZ4L_RooSpinZeroPdf_1D_fast& other, const char* name=0);
   virtual TObject* clone(const char* newname) const { return new VVHZZ4L_RooSpinZeroPdf_1D_fast(*this, newname); }
-  inline virtual ~VVHZZ4L_RooSpinZeroPdf_1D_fast(){}
-
-  Float_t interpolateFcn(Int_t code, const char* rangeName=0) const;
-  Double_t evaluate() const;
-  Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* rangeName=0) const;
-  Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;
 
 protected:
   ClassDef(VVHZZ4L_RooSpinZeroPdf_1D_fast, 1)
-
 };
- 
+
 #endif
diff --git a/interface/VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai.h b/interface/VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai.h
@@ -0,0 +1,30 @@
+#ifndef VVHZZ4L_ROOSPINZEROPDF_1D_FAST_A1AI
+#define VVHZZ4L_ROOSPINZEROPDF_1D_FAST_A1AI
+
+#include "VVHZZ4L_RooSpinZeroPdf_1D_fast_base.h"
+
+#include "RooRealProxy.h"
+
+class VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai : public VVHZZ4L_RooSpinZeroPdf_1D_fast_base{
+protected:
+  RooRealProxy a1, ai1;
+  virtual double a1Val() const;
+  virtual double ai1Val() const;
+  virtual bool isAnomalousCouplingValueValid() const;
+public:
+  VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai();
+  VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai(
+    const char *name, const char *title,
+    RooAbsReal& in_a1,
+    RooAbsReal& in_ai1,
+    const RooArgList& inObsList,
+    const RooArgList& inCoefList
+    );
+  VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai(const VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai& other, const char* name=0);
+  virtual TObject* clone(const char* newname) const { return new VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai(*this, newname); }
+
+protected:
+  ClassDef(VVHZZ4L_RooSpinZeroPdf_1D_fast_a1ai, 1)
+};
+
+#endif
diff --git a/interface/VVHZZ4L_RooSpinZeroPdf_1D_fast_base.h b/interface/VVHZZ4L_RooSpinZeroPdf_1D_fast_base.h
@@ -0,0 +1,38 @@
+#ifndef VVHZZ4L_ROOSPINZEROPDF_1D_FAST_BASE
+#define VVHZZ4L_ROOSPINZEROPDF_1D_FAST_BASE
+
+#include "RooAbsReal.h"
+#include "RooAbsPdf.h"
+#include "RooRealVar.h"
+#include "RooConstVar.h"
+#include "RooListProxy.h"
+
+
+class VVHZZ4L_RooSpinZeroPdf_1D_fast_base : public RooAbsPdf{
+protected:
+  RooListProxy obsList; //  List of observables
+  RooListProxy coefList; //  List of pdf components
+
+  virtual double a1Val() const = 0;
+  virtual double ai1Val() const = 0;
+  virtual bool isAnomalousCouplingValueValid() const = 0;
+
+public:
+  VVHZZ4L_RooSpinZeroPdf_1D_fast_base();
+  VVHZZ4L_RooSpinZeroPdf_1D_fast_base(
+    const char *name, const char *title,
+    const RooArgList& inObsList,
+    const RooArgList& inCoefList
+    );
+
+  VVHZZ4L_RooSpinZeroPdf_1D_fast_base(const VVHZZ4L_RooSpinZeroPdf_1D_fast_base& other, const char* name=0);
+  virtual TObject* clone(const char* newname) const = 0;
+  inline virtual ~VVHZZ4L_RooSpinZeroPdf_1D_fast_base(){}
+
+  Float_t interpolateFcn(Int_t code, const char* rangeName=0) const;
+  Double_t evaluate() const;
+  Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* rangeName=0) const;
+  Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;
+};
+
+#endif
diff --git a/python/ModelTools.py b/python/ModelTools.py
@@ -106,6 +106,9 @@ def __init__(self,datacard,options):
     def setPhysics(self,physicsModel):
         self.physics = physicsModel
         self.physics.setModelBuilder(self)
+        for b in self.DC.bins:
+            for p in self.DC.exp[b].keys():
+                self.physics.tellAboutProcess(b, p)
 discparams = ROOT.RooArgSet("discreteParams") 
 RooArgSet *discreteParameters = (RooArgSet*) w->genobj("discreteParams"); 
 CascadeMinimizerGlobalConfigs::O().pdfCategories = RooArgList(); 
 CascadeMinimizerGlobalConfigs::O().allRooMultiPdfParams = RooArgList(); 
 if (discreteParameters != 0) { 
     TIterator *dp = discreteParameters->createIterator(); 
     while (RooAbsArg *arg = (RooAbsArg*)dp->Next()) { 
       RooCategory *cat = dynamic_cast<RooCategory*>(arg); 
 discparams = ROOT.RooArgSet("discreteParams") 
 RooArgSet *discreteParameters = (RooArgSet*) w->genobj("discreteParams"); 
   
 CascadeMinimizerGlobalConfigs::O().pdfCategories = RooArgList(); 
 CascadeMinimizerGlobalConfigs::O().allRooMultiPdfParams = RooArgList(); 
  
 if (discreteParameters != 0) { 
     TIterator *dp = discreteParameters->createIterator(); 
     while (RooAbsArg *arg = (RooAbsArg*)dp->Next()) { 
       RooCategory *cat = dynamic_cast<RooCategory*>(arg); 
     def doModel(self, justCheckPhysicsModel=False):
         if not justCheckPhysicsModel: self.doObservables()
         self.physics.doParametersOfInterest()

diff --git a/python/PhysicsModel.py b/python/PhysicsModel.py
@@ -25,6 +25,10 @@ def doParametersOfInterest(self):
     def preProcessNuisances(self,nuisances):
         "receive the usual list of (name,nofloat,pdf,args,errline) to be edited"
         pass # do nothing by default
+    def tellAboutProcess(self,bin,process):
+        "tell the physics model to expect this process, in case it needs to know about all the processes"
+        "before it gets the yield and scale"
+        pass # do nothing by default
     def getYieldScale(self,bin,process):
         "Return the name of a RooAbsReal to scale this yield by or the two special values 1 and 0 (don't scale, and set to zero)"
         return "r" if self.DC.isSignal[process] else 1;