Index: trunk/UTIL/PYTHON/api/api_wrapper.py
===================================================================
--- trunk/UTIL/PYTHON/api/api_wrapper.py	(revision 947)
+++ trunk/UTIL/PYTHON/api/api_wrapper.py	(revision 948)
@@ -1,4 +1,7 @@
 
 ### A. Spiga -- LMD -- 03/07/2011
+
+import api
+import numpy as np
 
 def api_onelevel (  path_to_input   = './', \
@@ -17,6 +20,4 @@
                     onelevel        = 0.020, \
                     nocall          = False ):
-    import api
-    import numpy as np
 
     if not path_to_output:  path_to_output = path_to_input
@@ -37,6 +38,4 @@
         onelevel = -99999.
 
-    print input_name, output_name
-
     if nocall:     pass
     else:          api.api_main ( path_to_input, input_name, path_to_output, output_name, \
Index: trunk/UTIL/PYTHON/pp.py.old
===================================================================
--- trunk/UTIL/PYTHON/pp.py.old	(revision 947)
+++ 	(revision )
@@ -1,197 +1,0 @@
-#!/usr/bin/env python
-
-### A. Spiga + T. Navarro + A. Colaitis
-
-###########################################################################################
-###########################################################################################
-### What is below relate to running the file as a command line executable (very convenient)
-if __name__ == "__main__":
-    import sys
-    from optparse import OptionParser    ### to be replaced by argparse
-    from api_wrapper import api_onelevel
-    from gcm_transformations import call_zrecast
-    from netCDF4 import Dataset
-    from myplot import getlschar, separatenames, readslices, adjust_length, whatkindfile, errormess
-    from os import system
-    from planetoplot import planetoplot
-    from myscript import getparseroptions
-    import glob
-    import numpy as np
-
-
-    #############################
-    ### Get options and variables
-    parser = OptionParser() ; getparseroptions(parser) ; (opt,args) = parser.parse_args()
-    if opt.file is None:                                errormess("I want to eat one file at least ! Use pp.py -f name_of_my_file. Or type pp.py -h")
-    if opt.var is None and opt.anomaly is True: 	errormess("Cannot ask to compute anomaly if no variable is set")
-    if opt.fref is not None and opt.operat is None: 	errormess("you must specify an operation when using a reference file")
-    if opt.operat in ["+","-"] and opt.fref is None: 	errormess("you must specifiy a reference file when using inter-file operations")
-    if opt.fref is not None and opt.operat is not None and opt.itp is not None: interpref=True
-    else:   interpref=False
-    if opt.rate is not None:      opt.save = "avi"
-    elif opt.save == "avi":       opt.rate = 8   ## this is a default value for -S avi
-    if opt.save == "html":        opt.rate = -1  ## this is convenient because everything is done in planetoplot with mrate
-
-    #############################
-    ### Get infos about slices
-    zeslat  = readslices(opt.slat) ; zeslon  = readslices(opt.slon) ; zesvert = readslices(opt.svert) ; zestime = readslices(opt.stime)
-
-    reffile = opt.fref
-    zexaxis = [opt.xmin,opt.xmax] ; zeyaxis=[opt.ymin,opt.ymax]
-
-    #############################
-    ### Catch multiple files
-    if "*" in opt.file[0] or "?" in opt.file[0]: 
-        yeah = glob.glob(opt.file[0]) ; yeah.sort()
-        opt.file[0] = yeah[0] 
-        for file in yeah[1:]: opt.file[0] = opt.file[0] + "," + file
-
-    #############################
-    ### 1. LOOP ON FILE LISTS TO BE PUT IN DIFFERENT FIGURES
-    for i in range(len(opt.file)):
-
-      zefiles = separatenames(opt.file[i])
-
-      typefile = whatkindfile(Dataset(zefiles[0])) ; stralt = None
-      if typefile in ["meso"]:          
-          [lschar,zehour,zehourin] = getlschar ( zefiles[0] )
-          if opt.var is None:  opt.var = ["HGT"] ; opt.nocolorb = True
-      elif typefile in ["geo"]:
-          lschar=""
-          if opt.var is None:  opt.var = ["HGT_M"] ; opt.nocolorb = True
-      else:                                      
-          lschar="" 
-          if opt.var is None:  
-             opt.var = ["phisinit"] ; opt.clb = "nobar"
-             ### temporaire... en attendant mieux.
-             if opt.back == "titan": opt.var = ["phis"] ; opt.nocolorb = True
-
-      if opt.vmin is not None : zevmin  = opt.vmin[min(i,len(opt.vmin)-1)]
-      else:                     zevmin = None
-      if opt.vmax is not None : zevmax  = opt.vmax[min(i,len(opt.vmax)-1)]
-      else:                     zevmax = None
-      #print "vmin, zevmin", opt.vmin, zevmin ; print "vmax, zevmax", opt.vmax, zevmax
-
-      #############################
-      ### 2. LOOP ON VAR LISTS TO BE PUT IN DIFFERENT FIGURES
-      for j in range(len(opt.var)):
-
-        zevars = separatenames(opt.var[j])
-
-        inputnvert = separatenames(opt.lvl)
-        if np.array(inputnvert).size == 1:
-            zelevel = float(inputnvert[0])
-            ze_interp_levels = [-9999.]
-        elif np.array(inputnvert).size > 2:
-            zelevel = -99.
-            start = float(inputnvert[0])
-            stop = float(inputnvert[1])
-            if np.array(inputnvert).size == 2:  numsample = 20
-            else:                               numsample = float(inputnvert[2])
-            if stop > start:   
-               ## altitude coordinates
-               ze_interp_levels = np.linspace(start,stop,numsample)
-            else:
-               ## pressure coordinates
-               ze_interp_levels = np.logspace(np.log10(start),np.log10(stop),numsample)
-
-        ######################################################### 
-        if opt.itp is not None:
-         if opt.itp > 0:
-          #####
-          ##### MESOSCALE : written by AS
-          #####
-          if typefile in ["meso"]:
-            if zelevel == 0. and opt.itp == 4:  zelevel = 0.010
-            if np.array(inputnvert).size == 1:  zesvert = readslices([str(zelevel)])
-            ### winds or no winds
-            if opt.winds            :  zefields = 'uvmet'
-            elif opt.var[j] in ['deltat','DELTAT'] : zefields = 'tk,TSURF'
-            elif opt.var[j] in ['uv','UV','hodograph','hodograph_2'] : zefields = 'U,V'
-            elif opt.var[j] in ['uvmrams']: zefields = 'Umetmrams,Vmetmrams'
-            else                    :  zefields = ''
-            ### var or no var
-            if zefields == ''       :  zefields = opt.var[j] 
-            else                    :  zefields = zefields + "," + opt.var[j]
-            if opt.var2 is not None :  zefields = zefields + "," + opt.var2  
-            ### call fortran routines
-            for fff in range(len(zefiles)):
-                newname = api_onelevel (  path_to_input   = '', \
-                                               input_name      = zefiles[fff], \
-                                               fields          = zefields, \
-                                               interp_method   = opt.itp, \
-                                               interp_level    = ze_interp_levels, \
-                                               onelevel        = zelevel, \
-                                               nocall          = opt.nocall )
-                if fff == 0: zetab = newname 
-                else:        zetab = np.append(zetab,newname)
-            if interpref:
-                reffile = api_onelevel (  path_to_input   = '', \
-                                               input_name      = opt.fref, \
-                                               fields          = zefields, \
-                                               interp_method   = opt.itp, \
-                                               interp_level    = ze_interp_levels, \
-                                               onelevel        = zelevel, \
-                                               nocall          = opt.nocall )
-            zefiles = zetab #; print zefiles
-            zelevel = 0 ## so that zelevel could play again the role of nvert
-          #####
-          ##### GCM : written by AC
-          #####
-          elif typefile == "gcm":
-            inputvar = zevars
-            if opt.var2 is not None : inputvar = np.append(inputvar,opt.var2)
-            interpolated_files=""
-            interpolated_files=call_zrecast(interp_mode=opt.itp,\
-                    input_name=zefiles,\
-                    fields=inputvar,\
-                    limites = ze_interp_levels,\
-                    predefined=opt.intas)
-
-            zefiles=interpolated_files
-            if interpref:
-               interpolated_ref=""
-               interpolated_ref=call_zrecast(interp_mode=opt.itp,\
-                    input_name=[opt.fref],\
-                    fields=zevars,\
-                    predefined=opt.intas)
-
-               reffile=interpolated_ref[0]
-          else:
-            print "type not supported"
-            exit()
-
-        #############
-        ### Main call
-        name = planetoplot (zefiles,level=int(zelevel),vertmode=opt.itp,\
-                proj=opt.proj,back=opt.back,target=opt.tgt,stride=opt.ste,var=zevars,\
-                clb=separatenames(opt.clb),winds=opt.winds,\
-                addchar=lschar,vmin=zevmin,vmax=zevmax,\
-                tile=opt.tile,zoom=opt.zoom,display=opt.display,\
-                hole=opt.hole,save=opt.save,\
-                anomaly=opt.anomaly,var2=opt.var2,ndiv=opt.ndiv,\
-                mult=opt.mult,add=opt.add,zetitle=separatenames(opt.zetitle),\
-                slon=zeslon,slat=zeslat,svert=zesvert,stime=zestime,\
-                outputname=opt.out,resolution=opt.res,\
-                ope=opt.operat,fileref=reffile,minop=opt.vminope,maxop=opt.vmaxope,titleref=opt.titref,\
-                invert_y=opt.inverty,xaxis=zexaxis,yaxis=zeyaxis,ylog=opt.logy,xlog=opt.logx,yintegral=opt.column,\
-                blat=opt.blat,blon=opt.blon,tsat=opt.tsat,flagnolow=opt.nolow,\
-                mrate=opt.rate,mquality=opt.quality,trans=opt.trans,zarea=opt.area,axtime=opt.axtime,\
-                redope=opt.redope,seevar=opt.seevar,xlab=opt.xlab,ylab=opt.ylab,lbls=separatenames(opt.labels),\
-                lstyle=separatenames(opt.linestyle),cross=readslices(opt.mark),markdevil=opt.mdevil,facwind=opt.facwind,\
-                trycol=opt.trycol,streamflag=opt.stream,nocolorb=opt.nocolorb,analysis=opt.analysis)
-        print 'DONE: '+name
-        system("rm -f to_be_erased")
-  
-    #########################################################
-    ### Generate a .sh file with the used command saved in it
-    command = ""  
-    for arg in sys.argv: command = command + arg + ' '
-    #if typefile not in ["meso","mesoapi"]: name = 'pycommand'
-    if opt.save == "gui":    name = 'pycommand'
-    elif opt.save == "html": system("cat $PYTHONPATH/header.html > anim.html ; cat zepics >> anim.html ; cat $PYTHONPATH/body.html >> anim.html ; rm -rf zepics "+name+" ; mkdir "+name+" ; mv anim.html image*png "+name) 
-    f = open(name+'.sh', 'w')
-    f.write(command)
-
-    #print "********** OPTIONS: ", opt
-    print "********************************************************** END"
Index: trunk/UTIL/PYTHON/sparse/sparse_example.sh
===================================================================
--- trunk/UTIL/PYTHON/sparse/sparse_example.sh	(revision 948)
+++ trunk/UTIL/PYTHON/sparse/sparse_example.sh	(revision 948)
@@ -0,0 +1,11 @@
+sparse.py \
+ -f "/planeto/lmlmd/TESdata/TES_MY25_180_210.sav" \
+ -X lon -Y lat \
+ -C coldust -p ortho \
+ --blon 90 -m 0. -M 1. \
+ -c spectral \
+ -w "areoc>180,areoc<182" \
+ -w "areoc>182,areoc<184" \
+ -w "areoc>184,areoc<186" \
+ -w "areoc>186,areoc<188" \
+ -b molabw -S png 
