Merge branch 'integration' into devel

Jürgen Knödlseder
2 parents 139c3fb5 89681d24
Showing 3 changed files with 3 additions and 3 deletions
scripts/cspull.py
scripts/cstsdist.py
src/ctobssim/ctobssim.cpp
@@ -302,7 +302,7 @@ class cspull(GApplication):
 			model_name = model.name()
 			for k in range(model.size()):
 				par = model[k]
-				if par.isfree():
+				if par.is_free():
  
 					# Set parameter name
 					name = model_name+"_"+par.name()
@@ -477,7 +477,7 @@ class cstsdist(GApplication):
 			model_name = model.name()
 			for k in range(model.size()):
 				par = model[k]
-				if par.isfree():
+				if par.is_free():
  
 					# Set parameter name
 					name = model_name+"_"+par.name()
@@ -898,7 +898,7 @@ void ctobssim::simulate_background(GCTAObservation* obs,
  
             // If we have a data model that applies to CTA then simulate
             // events
-            if (model != NULL && model->isvalid("CTA", "")) {
+            if (model != NULL && model->is_valid("CTA", "")) {
  
                 // Get simulated CTA event list. Note that this method
                 // includes the deadtime correction.