Merge branch 'master' into dks

src/classes/PRunSingleHisto.cpp

@@ -1538,7 +1538,7 @@ void PRunSingleHisto::EstimateN0()
   if (paramNo > 10000) // i.e. fun or map
     return;
 
-  // still missing: set this value in the parameters
+  // get the parameters
   PMsrParamList *param = fMsrInfo->GetMsrParamList();
   assert(param);
 
@@ -1547,6 +1547,11 @@ void PRunSingleHisto::EstimateN0()
     return;
   }
 
+  // check if N0 is fixed. If this is the case, do NOT estimate N0
+  if (param->at(paramNo-1).fStep == 0.0) // N0 parameter fixed
+    return;
+
+
   // check that 'backgr.fit' in the msr-file run block is indeed a parameter number.
   // in case it is a function, nothing will be done.
   Int_t paramNoBkg = fRunInfo->GetBkgFitParamNo();

src/classes/PTheory.cpp

@@ -301,6 +301,7 @@ PTheory::PTheory(PMsrHandler *msrInfo, UInt_t runNo, const Bool_t hasParent) : f
       cerr << endl << ">> PTheory::PTheory: **ERROR** user function object could not be invoked. See line no " << line->fLineNo;
       cerr << endl;
       fValid = false;
+      return;
     } else { // user function valid, hence expand the fUserParam vector to the proper size
       fUserParam.resize(fParamNo.size());
     }