Changeset 1015 for trunk/UTIL

Timestamp:

Jul 31, 2013, 11:36:52 AM (11 years ago)

Author:

tnavarro

Message:

small change with time axis operation mars_dayini

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• pp.py (modified) (1 diff)
• ppclass.py (modified) (1 diff)

trunk/UTIL/PYTHON/planetoplot_v2/pp.py

@@ -54 +54 @@
 parser.add_option('-d','--directory',action='store',dest='folder',type="string",default="./",help="directory of output files")
 parser.add_option('-s','--changetime',action='store',dest='changetime',type="string",default=None,\
-                  help="transformation on time axis : [None] | mars_sol2ls | mars_meso_ls | mars_meso_sol | mars_meso_utc | mars_meso_lt ")
+                  help="transformation on time axis : [None] | mars_sol2ls | mars_dayini | mars_meso_ls | mars_meso_sol | mars_meso_utc | mars_meso_lt ")
 parser.add_option('-p','--print',action='store_true',dest='savtxt',default=False,help="[1D] output field+coord in an ASCII file")
 parser.add_option('--stridex',action='store',dest='stridex',type="int",default=1,help="Load data every stridex grid points over x dimension")

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -1369 +1369 @@
         if self.changetime is not None:
             if self.verbose: print "**** OK. Converting time axis:",self.changetime
-            ### option added by T. Navarro 
-            if self.changetime == "mars_sol2ls": 
-                self.field_t =  self.field_t \
-                              + self.f.variables['controle'][3]%669 \
-                              + self.f.variables['controle'][26]
+            ### option added by T. Navarro
+            if self.changetime == "mars_sol2ls":
+                if "controle" in self.f.variables: 
+                   self.field_t =  self.field_t \
+                                 + self.f.variables['controle'][3]%669 \
+                                 + self.f.variables['controle'][26]
                 self.field_t = ppcompute.mars_sol2ls(self.field_t)
-            elif self.changetime == "marsdayini":
+            elif self.changetime == "mars_dayini" and "controle" in self.f.variables:
                 self.field_t =  self.field_t \
                               + self.f.variables['controle'][3]%669 \