Commit 444c3ce6 authored by ivar's avatar ivar
Browse files

reintroduced R-scaling factor in obspack

parent 113a22eb
......@@ -128,7 +128,7 @@ class ObsPackObservations(Observation):
alts = ncf.GetVariable('altitude').take(subselect,axis=0)
obs = ncf.GetVariable('value').take(subselect,axis=0)
if obsspecie == self.ObsPackCo2Dir:
obs = obs*1.e6 #IV convert to ppm
obs = obs #*1.e6 #IV convert to ppm
species = ncf.GetAttribute('dataset_parameter')
#strategy = ncf.GetVariable('sampling_strategy').take(subselect,axis=0)
strategy = 1
......@@ -186,7 +186,7 @@ class ObsPackObservations(Observation):
tr_species=array(tr_species)
if self.Co2_only:
simulated = simulated*1.e6
simulated = simulated #*1.e6
if self.C13_only:
simulated = mtp.MixingratioToPermil(filename,simulated)
if self.Co2_C13_together:
......@@ -414,10 +414,12 @@ 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']
if species=='co2c13':
# obs.mdmc13 = SiteInfo[identifier]['error_c13']
obs.mdm = SiteInfo[identifier]['error_c13']
else:
obs.mdm = SiteInfo[identifier]['error']*self.global_R_scaling
print obs,obs.mdm,species
obs.may_localize = SiteInfo[identifier]['may_localize']
obs.may_reject = SiteInfo[identifier]['may_reject']
......
Markdown is supported
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