Merge pull request cms-sw#85 from cms-analysis/master

Merge changes from master into development branch

interface/Combine.h

@@ -68,7 +68,7 @@ class Combine {
   std::string modelConfigName_, modelConfigNameB_;
   bool validateModel_;
   bool saveToys_;
-  float mass_;
+  double mass_;
 
   // implementation-related variables
   bool compiledExpr_;

python/HiggsJPC.py

@@ -60,9 +60,9 @@ def setPhysicsOptions(self,physOptions):
 		self.fqqFloating = True
                 self.muFloating = True
                 self.fqqRange = po.replace("fqqRange=","").split(",")
-                if len(self.mHRange) != 2:
+                if len(self.fqqRange) != 2:
                     raise RuntimeError, "fqq range definition requires two extrema"
-                elif float(self.mHRange[0]) >= float(self.mHRange[1]):
+                elif float(self.fqqRange[0]) >= float(self.fqqRange[1]):
                     raise RuntimeError, "Extrema for fqq range defined with inverterd order. Second must be larger the first"
             if po == "muAsPOI": 
                 print "Will consider the signal strength as a parameter of interest"

src/Combine.cc

@@ -310,6 +310,8 @@ void Combine::run(TString hlfFile, const std::string &dataset, double &limit, do
     }
     if (snapshotName_ != "") {
       w->loadSnapshot(snapshotName_.c_str());
+      //make sure mass value used is really the one from the loaded snapshot
+      mass_ = MH->getVal();
     }
   } else {
     hlf.reset(new RooStats::HLFactory("factory", fileToLoad));