Skip to content

Commit 6a1a5f8

Browse files
Debug for scripted call
1 parent 1259b27 commit 6a1a5f8

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

Config/sample_SEABIRD_pySAS.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
"seaBASSHeaderFileName": "sample_SEABIRD_pySAS.hdr",
153153
"bL2SaveSeaBASS": 1,
154154
"bL2WriteReport": 1,
155-
"bL2filterMetFlags": 0,
156155
"bL2Prodoc3m": 1,
157156
"bL2Prodkd490": 0,
158157
"bL2Prodpic": 0,

Config/sample_SEABIRD_pySAS.hdr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"rho_correction": "M99",
3535
"NIR_residual_correction": "R06",
3636
"BRDF_correction": "L11",
37-
"comments": "! HyperInSPACE vers = 1.2.13\n! HyperInSPACE Config = sample_SEABIRD_pySAS.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = On\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = On\n! Rotator Min = -126.0\n! Rotator Max = 42.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 90.0\n! Rel Azimuth Max = 135.0\n! Deglitch Filter = On\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.3\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.3\n! LI Light Sigma = 3.0\n! LT Dark Window = 11\n! LT Light Window = 13\n! LT Dark Sigma = 3.2\n! LT Light Sigma = 2.7\n! FRM Pathway = FRM-Full-Characterization\n! Wavelength Interp Int = 3.3\n! Max Wind = 10.0\n! Min SZA = 20.0\n! Max SZA = 60.0\n! Spectral Filter = On\n! Filter Sigma Es = 5.0\n! Filter Sigma Li = 8.0\n! Filter Sigma Lt = 3.0\n! Meteorological Filter = On\n! Cloud Flag = 1.0\n! Es Flag = 2.0\n! Dawn/Dusk Flag = 1.0\n! Rain/Humidity Flag = 1.095\n! Ensemble Interval = 300\n! Percent Lt Filter = On\n! Percent Light = 10.0\n! Remove Negatives = On",
37+
"comments": "! HyperInSPACE vers = 1.2.13\n! HyperInSPACE Config = /Users/daurin/GitRepos/HyperCP/Config/sample_SEABIRD_pySAS.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = On\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = On\n! Rotator Min = -126.0\n! Rotator Max = 42.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 90.0\n! Rel Azimuth Max = 135.0\n! Deglitch Filter = On\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.3\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.3\n! LI Light Sigma = 3.0\n! LT Dark Window = 11\n! LT Light Window = 13\n! LT Dark Sigma = 3.2\n! LT Light Sigma = 2.7\n! FRM Pathway = FRM-Full-Characterization\n! Wavelength Interp Int = 3.3\n! Max Wind = 10.0\n! Min SZA = 20.0\n! Max SZA = 60.0\n! Spectral Filter = On\n! Filter Sigma Es = 5.0\n! Filter Sigma Li = 8.0\n! Filter Sigma Lt = 3.0\n! Meteorological Filter = On\n! Cloud Flag = 1.0\n! Es Flag = 2.0\n! Dawn/Dusk Flag = 1.0\n! Rain/Humidity Flag = 1.095\n! Ensemble Interval = 300\n! Percent Lt Filter = On\n! Percent Light = 10.0\n! Remove Negatives = On",
3838
"other_comments": "!\n! COMMENTS\n!\n! FRM4SOC-2 Field InterComparison Experiment (FICE)\n! July 11 - 21, 2022\n! Acqua Alta Oceanographic Tower (AAOT), CNR-ISMAR\n!\n! Ancillary data from: % https://www.comune.venezia.it/content/3-piattaforma-ISMAR-CNR\n! and field notes. relAz refers to target relative azimuth in pySAS.\n!\n! Home",
3939
"missing": -9999,
4040
"delimiter": "comma"

Config/sample_TRIOS_NOTRACKER.hdr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"rho_correction": "M99",
3535
"NIR_residual_correction": "R06",
3636
"BRDF_correction": "NoBRDF",
37-
"comments": "! HyperInSPACE vers = 1.2.11\n! HyperInSPACE Config = sample_TRIOS_NOTRACKER.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = Off\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = Off\n! Rotator Min = -40.0\n! Rotator Max = 40.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 90.0\n! Rel Azimuth Max = 135.0\n! Deglitch Filter = Off\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.3\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.3\n! LI Light Sigma = 3.0\n! LT Dark Window = 11\n! LT Light Window = 13\n! LT Dark Sigma = 3.2\n! LT Light Sigma = 2.7\n! FRM Pathway = FRM-Full-Characterization\n! Wavelength Interp Int = 3.3\n! Max Wind = 10.0\n! Min SZA = 20.0\n! Max SZA = 60.0\n! Spectral Filter = On\n! Filter Sigma Es = 5.0\n! Filter Sigma Li = 8.0\n! Filter Sigma Lt = 3.0\n! Meteorological Filter = On\n! Cloud Flag = 1.0\n! Es Flag = 2.0\n! Dawn/Dusk Flag = 1.0\n! Rain/Humidity Flag = 1.095\n! Ensemble Interval = 300\n! Percent Lt Filter = On\n! Percent Light = 10.0\n! Remove Negatives = On",
37+
"comments": "! HyperInSPACE vers = 1.2.13\n! HyperInSPACE Config = /Users/daurin/GitRepos/HyperCP/Config/sample_TriOS_NOTRACKER.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = Off\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = Off\n! Rotator Min = -40.0\n! Rotator Max = 40.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 90.0\n! Rel Azimuth Max = 135.0\n! Deglitch Filter = Off\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.3\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.3\n! LI Light Sigma = 3.0\n! LT Dark Window = 11\n! LT Light Window = 13\n! LT Dark Sigma = 3.2\n! LT Light Sigma = 2.7\n! FRM Pathway = FRM-Full-Characterization\n! Wavelength Interp Int = 3.3\n! Max Wind = 10.0\n! Min SZA = 20.0\n! Max SZA = 60.0\n! Spectral Filter = On\n! Filter Sigma Es = 5.0\n! Filter Sigma Li = 8.0\n! Filter Sigma Lt = 3.0\n! Meteorological Filter = On\n! Cloud Flag = 1.0\n! Es Flag = 2.0\n! Dawn/Dusk Flag = 1.0\n! Rain/Humidity Flag = 1.095\n! Ensemble Interval = 300\n! Percent Lt Filter = On\n! Percent Light = 10.0\n! Remove Negatives = On",
3838
"other_comments": "!\n! Sample dataset for TriOS triplet with no GPS or sun tracker.\n! FRM4SOC-2 Field InterComparison Experiment (FICE)\n! July 11 - 21, 2022\n! Acqua Alta Oceanographic Tower (AAOT), CNR-ISMAR\n! \n! RelAz refer to solar-sensor relative azimuth angle.\n! Manually operated TriOS triplet. Height: ~15 m, Tower color: Red/yellow.\n!",
3939
"missing": -9999,
4040
"delimiter": "comma"

Main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,12 +686,14 @@ def __init__(
686686
# Now make it a list as it is expected to be
687687
# inputFile = [inputFile]
688688

689+
ConfigFile.loadConfig(self.configFilename)
690+
689691
# No GUI used: error message are display in prompt and not in graphical window
690692
MainConfig.settings["popQuery"] = 1 # 1 suppresses popup
691693
MainConfig.saveConfig(MainConfig.fileName)
692694
print("MainConfig - Config updated with cmd line arguments")
693695

694-
ConfigFile.loadConfig(self.configFilename)
696+
695697

696698
calFiles = ConfigFile.settings["CalibrationFiles"]
697699

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
3434

3535
**Main author**: Dirk Aurin, MSU @ NASA Goddard Space Flight Center <[email protected]>
3636

37-
**Co-authors**: Nathan Vandenberg @ UVictoria, Maycira Costa @ UVictoria (in the frame of [PySciDON](https://ieeexplore.ieee.org/abstract/document/8121926)), Alexis Deru @ ACRI-ST, Ashley Ramsay @ NPL, Agnieszka Bialek @ NPL, Marine Bretagnon @ ACRI-ST (in the frame of Copernicus' [FRM4SOC-2](https://frm4soc2.eumetsat.int/)), Gabriele Bai @ ACRI-ST, Juan Ignacio Gossn @ EUMETSAT, Nils Haentjens @ UMaine
37+
**Co-authors**: Nathan Vandenberg @ UVictoria (in the frame of [PySciDON](https://ieeexplore.ieee.org/abstract/document/8121926)), Ashley Ramsay @ NPL, Juan Ignacio Gossn @ EUMETSAT, Nils Haentjens @ UMaine, Agnieszka Bialek @ NPL, Alexis Deru @ ACRI-ST, Heng Gu @ NOAA, Mohamed Abdelmegid @ NOAA, Raphael Mabit @ UQuebec, Maycira Costa @ UVictoria, Marine Bretagnon @ ACRI-ST, Gabriele Bai @ ACRI-ST
3838

3939
**Contact**: Discussions tab in GitHub, or Dirk Aurin, MSU @ NASA Goddard Space Flight Center <[email protected]>, and Juan Ignacio Gossn @ EUMETSAT <[email protected]>
4040

run_Sample_Data.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929

3030
################################################### CUSTOM SET UP ###################################################
3131
# Batch options
32-
MULTI_TASK = True # Multiple threads for HyperSAS (any level) or TriOS (only L1A and up)
32+
MULTI_TASK = False # Multiple threads for HyperSAS (any level) or TriOS (only L1A and up)
3333
MULTI_LEVEL = False # Process raw (L0) to Level-2 (L2)
3434
CLOBBER = True # True overwrites existing files
3535
PROC_LEVEL = "L1A" # Process to this level: L1A, L1AQC, L1B, LBQC, L2 (ignored for MULTI_LEVEL)
3636

3737
# Dataset options
38-
# PLATFORM = "pySAS"
39-
PLATFORM = "Manual_TriOS"
40-
# INST_TYPE = "SEABIRD" # SEABIRD or TRIOS; defines raw file naming
41-
INST_TYPE = "TRIOS"
38+
PLATFORM = "pySAS"
39+
# PLATFORM = "Manual_TriOS"
40+
INST_TYPE = "SEABIRD" # SEABIRD or TRIOS; defines raw file naming
41+
# INST_TYPE = "TRIOS"
4242
CRUISE = "FICE22"
4343
# L1B_REGIME: Optional. [Default, Class, Full]
4444
# Denote FRM processing regime and use appropriately named subdirectories.

0 commit comments

Comments
 (0)