Commit c325450d78489c8d677dca281fde2708a9a2da71
Merge branch 'integration' into devel
Showing
3 changed files
with
3 additions
and
3 deletions
scripts/cspull.py
| @@ -302,7 +302,7 @@ class cspull(GApplication): | @@ -302,7 +302,7 @@ class cspull(GApplication): | ||
| 302 | model_name = model.name() | 302 | model_name = model.name() |
| 303 | for k in range(model.size()): | 303 | for k in range(model.size()): |
| 304 | par = model[k] | 304 | par = model[k] |
| 305 | - if par.isfree(): | 305 | + if par.is_free(): |
| 306 | 306 | ||
| 307 | # Set parameter name | 307 | # Set parameter name |
| 308 | name = model_name+"_"+par.name() | 308 | name = model_name+"_"+par.name() |
scripts/cstsdist.py
| @@ -477,7 +477,7 @@ class cstsdist(GApplication): | @@ -477,7 +477,7 @@ class cstsdist(GApplication): | ||
| 477 | model_name = model.name() | 477 | model_name = model.name() |
| 478 | for k in range(model.size()): | 478 | for k in range(model.size()): |
| 479 | par = model[k] | 479 | par = model[k] |
| 480 | - if par.isfree(): | 480 | + if par.is_free(): |
| 481 | 481 | ||
| 482 | # Set parameter name | 482 | # Set parameter name |
| 483 | name = model_name+"_"+par.name() | 483 | name = model_name+"_"+par.name() |
src/ctobssim/ctobssim.cpp
| @@ -898,7 +898,7 @@ void ctobssim::simulate_background(GCTAObservation* obs, | @@ -898,7 +898,7 @@ void ctobssim::simulate_background(GCTAObservation* obs, | ||
| 898 | 898 | ||
| 899 | // If we have a data model that applies to CTA then simulate | 899 | // If we have a data model that applies to CTA then simulate |
| 900 | // events | 900 | // events |
| 901 | - if (model != NULL && model->isvalid("CTA", "")) { | 901 | + if (model != NULL && model->is_valid("CTA", "")) { |
| 902 | 902 | ||
| 903 | // Get simulated CTA event list. Note that this method | 903 | // Get simulated CTA event list. Note that this method |
| 904 | // includes the deadtime correction. | 904 | // includes the deadtime correction. |