DaCycle object changed

da/ct/obs.py

@@ -32,12 +32,12 @@ class CtObservations(Observation):
 
     def Initialize(self,DaCycle):
 
-        self.startdate = DaCycle.da_settings['time.sample.start']
-        self.enddate   = DaCycle.da_settings['time.sample.end']
+        self.startdate = DaCycle['time.sample.start']
+        self.enddate   = DaCycle['time.sample.end']
         DaSystem       = DaCycle.DaSystem
 
-        sfname      = DaSystem.da_settings['obs.input.fname']
-        filename    = os.path.join(DaSystem.da_settings['obs.input.dir'],sfname)
+        sfname      = DaSystem['obs.input.fname']
+        filename    = os.path.join(DaSystem['obs.input.dir'],sfname)
 
         if not os.path.exists(filename):
             msg     = 'Could not find  the required observation input file (%s) ' % filename ; logging.error(msg)
@@ -144,7 +144,7 @@ class CtObservations(Observation):
         """
         import shutil
 
-        obsinputfile   = os.path.join(DaCycle.da_settings['dir.input'],'observations.nc')
+        obsinputfile   = os.path.join(DaCycle['dir.input'],'observations.nc')
 
         dummy          = shutil.copy(self.ObsFilename,obsinputfile)
         msg         = "           [copying source] .... %s " % self.ObsFilename  ; logging.debug(msg)
@@ -239,8 +239,8 @@ if __name__ == "__main__":
     obs = CtObservations()
 
     DaCycle = JobStart(['-v'],{'rc':'da.rc'})
-    DaCycle.da_settings['time.sample.start'] = datetime(2000,1,1)
-    DaCycle.da_settings['time.sample.end'] = datetime(2000,1,2)
+    DaCycle['time.sample.start'] = datetime(2000,1,1)
+    DaCycle['time.sample.end'] = datetime(2000,1,2)
 
     obs.Initialize(DaCycle)
     obs.Validate()