Skip to content

Commit efac237

Browse files
committed
switch default asset from atlas-s3 to nsidc-s3
1 parent 6d55dba commit efac237

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

sliderule/icesat2.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
# create logger
5252
logger = logging.getLogger(__name__)
5353

54+
# default asset
55+
DEFAULT_ASSET="nsidc-s3"
56+
5457
# default maximum number of resources to process in one request
5558
DEFAULT_MAX_REQUESTED_RESOURCES = 300
5659
max_requested_resources = DEFAULT_MAX_REQUESTED_RESOURCES
@@ -572,7 +575,7 @@ def cmr (polygon=None, time_start=None, time_end=None, version='004', short_name
572575
#
573576
# ATL06
574577
#
575-
def atl06 (parm, resource, asset="atlas-s3", track=0):
578+
def atl06 (parm, resource, asset=DEFAULT_ASSET, track=0):
576579

577580
try:
578581
return __atl06(parm, resource, asset, track)[0]
@@ -583,7 +586,7 @@ def atl06 (parm, resource, asset="atlas-s3", track=0):
583586
#
584587
# PARALLEL ATL06
585588
#
586-
def atl06p(parm, asset="atlas-s3", track=0, max_workers=0, version='004', block=True, resources=None):
589+
def atl06p(parm, asset=DEFAULT_ASSET, track=0, max_workers=0, version='004', block=True, resources=None):
587590

588591
try:
589592
if resources == None:
@@ -598,7 +601,7 @@ def atl06p(parm, asset="atlas-s3", track=0, max_workers=0, version='004', block=
598601
#
599602
# Subsetted ATL03
600603
#
601-
def atl03s (parm, resource, asset="atlas-s3", track=0):
604+
def atl03s (parm, resource, asset=DEFAULT_ASSET, track=0):
602605

603606
try:
604607
return __atl03s(parm, resource, asset, track)[0]
@@ -609,7 +612,7 @@ def atl03s (parm, resource, asset="atlas-s3", track=0):
609612
#
610613
# PARALLEL SUBSETTED ATL03
611614
#
612-
def atl03sp(parm, asset="atlas-s3", track=0, max_workers=0, version='004', block=True, resources=None):
615+
def atl03sp(parm, asset=DEFAULT_ASSET, track=0, max_workers=0, version='004', block=True, resources=None):
613616

614617
try:
615618
if resources == None:
@@ -623,7 +626,7 @@ def atl03sp(parm, asset="atlas-s3", track=0, max_workers=0, version='004', block
623626
#
624627
# H5
625628
#
626-
def h5 (dataset, resource, asset="atlas-s3", datatype=sliderule.datatypes["DYNAMIC"], col=0, startrow=0, numrows=ALL_ROWS):
629+
def h5 (dataset, resource, asset=DEFAULT_ASSET, datatype=sliderule.datatypes["DYNAMIC"], col=0, startrow=0, numrows=ALL_ROWS):
627630

628631
# Baseline Request
629632
rqst = {
@@ -665,7 +668,7 @@ def h5 (dataset, resource, asset="atlas-s3", datatype=sliderule.datatypes["DYNAM
665668
#
666669
# H5P
667670
#
668-
def h5p (datasets, resource, asset="atlas-s3"):
671+
def h5p (datasets, resource, asset=DEFAULT_ASSET):
669672

670673
# Baseline Request
671674
rqst = {

sliderule/ipxapi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#
4545
# ICEPYX ATL06
4646
#
47-
def atl06p(ipx_region, parm, asset="atlas-s3"):
47+
def atl06p(ipx_region, parm, asset=icesat2.DEFAULT_ASSET):
4848

4949
try:
5050
version = ipx_region.product_version
@@ -58,7 +58,7 @@ def atl06p(ipx_region, parm, asset="atlas-s3"):
5858
#
5959
# ICEPYX ATL03
6060
#
61-
def atl03sp(ipx_region, parm, asset="atlas-s3"):
61+
def atl03sp(ipx_region, parm, asset=icesat2.DEFAULT_ASSET):
6262

6363
try:
6464
version = ipx_region.product_version

sliderule/ipysliderule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self):
4242
# dropdown menu for setting asset
4343
self.asset = ipywidgets.Dropdown(
4444
options=['atlas-local', 'atlas-s3', 'nsidc-s3'],
45-
value='atlas-s3',
45+
value='nsidc-s3',
4646
description='Asset:',
4747
disabled=False,
4848
)

tests/atl06gs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# Set URL #
4343
if len(sys.argv) > 1:
4444
url = sys.argv[1]
45-
asset = "atlas-s3"
45+
asset = "nsidc-s3"
4646

4747
# Bypass Service Discovery #
4848
if len(sys.argv) > 2:

utils/region_of_interest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def process_atl06_algorithm(parms, asset, max_workers):
7878
# Set URL #
7979
if len(sys.argv) > 2:
8080
url = sys.argv[2]
81-
asset = "atlas-s3" # unlikely to use local if overriding url
81+
asset = "nsidc-s3" # unlikely to use local if overriding url
8282

8383
# Set Asset #
8484
if len(sys.argv) > 3:

0 commit comments

Comments
 (0)