TNO Intern

Commit ec178fd4 authored by Arjo Segers's avatar Arjo Segers
Browse files

Merge branch 'sesam' into 'master' 

Sesam

See merge request !17
parents 8f9c08fc dfbce942

src/cso/cso_file.py

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 
# 2025-09, Arjo Segers

#   Improved speed of CSO_Listing.Selection method.

#

# 2025-10, Arjo Segers

#   Replace ' and ' by ' & ' when selecting records.

#



########################################################################

###
@@ -1661,6 +1664,8 @@ class CSO_Listing(object): 
                # endfor

                # testing ...

                logging.info(f"{indent}selection `{selection}` ...")

                # adhoc: replace some operators that are not allowded anymore ...

                selection = selection.replace( " and ", " & " )

                # evaluate:

                xdf = df[ eval(selection) ]

                # any?

src/cso/cso_s5p.py

+7 −7
Original line number Diff line number Diff line
@@ -2860,11 +2860,11 @@ class CSO_S5p_Convert(utopya.UtopyaRc): 
            # info ...

            logging.info(indent + '  orbit "%s" ...' % orbit)



            # TESTING ..

            if orbit != "21861":

                logging.warning(f"{indent}    skip!")

                continue

            #endif

            ## TESTING ..

            #if orbit != "21861":

            #    logging.warning(f"{indent}    skip!")

            #    continue

            ##endif



            # select single orbit matching expression:

            odf = xlst.Select(
@@ -3226,8 +3226,8 @@ class CSO_S5p_Download(utopya.UtopyaRc): 
    The expressions should include templates '%{header}' for the column values.

    Example to select files from collection '03', preferably from processing 'RPRO' but otherwise from 'OFFL'::



        <rcbase>.selection           :  (%{collection} == '03') and (%{processing} == 'RPRO') ; \\

                                        (%{collection} == '03') and (%{processing} == 'OFFL')

        <rcbase>.selection           :  (%{collection} == '03') & (%{processing} == 'RPRO') ; \\

                                        (%{collection} == '03') & (%{processing} == 'OFFL')



    Sometimes a file cannot be converted, for example because it is corrupted or could not be downloaded at all.

    Specify an (optional) blacklist::