Commit f520efef authored by Peters, Wouter's avatar Peters, Wouter
Browse files

now using the global R scaling factor, could be 1.e-6 for instance

parent 9bd124bc
......@@ -301,7 +301,7 @@ class ObsPackObservations(Observation):
self.n_sites_moved = int(SitesWeights['n.sites.moved'])
msg = 'Model-data mismatch rejection threshold: %d ' % (self.rejection_threshold) ; logging.debug(msg)
msg = 'Model-data mismatch scaling factor : %f ' % (self.global_R_scaling) ; logging.debug(msg)
msg = 'Model-data mismatch scaling factor : %f ' % (self.global_R_scaling) ; logging.warning(msg)
msg = 'Model-data mismatch site categories : %d ' % (self.n_site_categories) ; logging.debug(msg)
msg = 'Model-data mismatch active sites : %d ' % (self.n_sites_active) ; logging.debug(msg)
msg = 'Model-data mismatch moved sites : %d ' % (self.n_sites_moved) ; logging.debug(msg)
......@@ -341,7 +341,7 @@ class ObsPackObservations(Observation):
if SiteInfo.has_key(identifier):
msg = "Observation found (%s, %s)" % (obs.code, identifier,) ; logging.debug(msg)
obs.mdm = SiteInfo[identifier]['error']
obs.mdm = SiteInfo[identifier]['error']* self.global_R_scaling
obs.may_localize = SiteInfo[identifier]['may_localize']
obs.may_reject = SiteInfo[identifier]['may_reject']
else:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment