Skip to content

Commit e97a5b3

Browse files
oceancolorcoderoceancolorcoder
committed
Clean up config files and un-ignore on master
1 parent 35ff1b1 commit e97a5b3

5 files changed

Lines changed: 84 additions & 32 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ Data/Sample_Data/SoRad/*
6262

6363
Config/*
6464
# To update sample configurations, uncomment:
65-
# !Config/sample_*_Calibration/
66-
# !Config/sample_*.cfg
67-
# !Config/sample_*.hdr
68-
# !Config/sample_*.csv
65+
!Config/sample_*_Calibration/
66+
!Config/sample_*.cfg
67+
!Config/sample_*.hdr
68+
!Config/sample_*.csv
6969

7070
## To allow local changes to a file on remote, but not have those tracked:
7171
# git update-index --skip-worktree Config/sample_SEABIRD_pySAS.cfg

‎Config/sample_SEABIRD_pySAS.cfg‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"fL1bqcSpecFilterEs": 5.0,
146146
"fL1bqcSpecFilterLi": 8.0,
147147
"fL1bqcSpecFilterLt": 3.0,
148-
"bL1bqcEnableQualityFlags": 0,
148+
"bL1bqcEnableQualityFlags": 1,
149149
"fL1bqcCloudFlag": 1.0,
150150
"fL1bqcSignificantEsFlag": 2.0,
151151
"fL1bqcDawnDuskFlag": 1.0,
@@ -163,10 +163,10 @@
163163
"bL2SimpleNIRCorrection": 0,
164164
"bL2SimSpecNIRCorrection": 1,
165165
"bL2NegativeSpec": 1,
166-
"bL2BRDF": 1,
166+
"bL2BRDF": 0,
167167
"bL2BRDF_fQ": 0,
168168
"bL2BRDF_IOP": 0,
169-
"bL2BRDF_O23": 1,
169+
"bL2BRDF_O23": 0,
170170
"bL2WeightMODISA": 1,
171171
"bL2WeightSentinel3A": 0,
172172
"bL2WeightVIIRSN": 0,
@@ -182,8 +182,7 @@
182182
"seaBASSHeaderFileName": "sample_SEABIRD_pySAS.hdr",
183183
"bL2SaveSeaBASS": 1,
184184
"bL2WriteReport": 1,
185-
"bL2EnableQualityFlags": 0,
186-
"FidRadDB": 1,
185+
"bL2EnableQualityFlags": 1,
187186
"bL2PlotProd": 1,
188187
"bL2Prodoc3m": 1,
189188
"bL2Prodkd490": 0,
@@ -193,10 +192,10 @@
193192
"bL2Prodavw": 1,
194193
"bL2Prodqwip": 1,
195194
"bL2ProdweiQA": 0,
196-
"bL2Prodgocad": 1,
197-
"bL2Prodag": 1,
198-
"bL2ProdSg": 1,
199-
"bL2ProdDOC": 1,
195+
"bL2Prodgocad": 0,
196+
"bL2Prodag": 0,
197+
"bL2ProdSg": 0,
198+
"bL2ProdDOC": 0,
200199
"bL2Prodgiop": 0,
201200
"bL2ProdaGiop": 0,
202201
"bL2ProdadgGiop": 0,
@@ -206,12 +205,12 @@
206205
"bL2ProdbbGiop": 0,
207206
"bL2ProdbbpGiop": 0,
208207
"bL2ProdbbpSGiop": 0,
209-
"bL2Prodqaa": 1,
208+
"bL2Prodqaa": 0,
210209
"bL2ProdaQaa": 0,
211-
"bL2ProdadgQaa": 1,
210+
"bL2ProdadgQaa": 0,
212211
"bL2ProdaphQaa": 0,
213212
"bL2ProdbQaa": 0,
214213
"bL2ProdbbQaa": 0,
215-
"bL2ProdbbpQaa": 1,
214+
"bL2ProdbbpQaa": 0,
216215
"bL2ProdcQaa": 0
217216
}

‎Config/sample_SEABIRD_pySAS.hdr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"nadir": "40",
3434
"rho_correction": "M99",
3535
"NIR_residual_correction": "R06",
36-
"BRDF_correction": "O23",
37-
"comments": "! HyperInSPACE vers = 1.2.14b\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 = 87.0\n! Rel Azimuth Max = 138.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.5\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.0\n! LI Light Sigma = 2.9\n! LT Dark Window = 11\n! LT Light Window = 5\n! LT Dark Sigma = 3.5\n! LT Light Sigma = 2.9\n! FRM Pathway = FRM-Full-Characterization\n! Thermal Source = Internal_Thermistor\n! Default Salt = 38.0\n! Default SST = 28.0\n! Default AOD = 0.2\n! Default Wind = 5.0\n! Default AirTemp = 26.0\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 = Off\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",
36+
"BRDF_correction": "noBRDF",
37+
"comments": "! HyperInSPACE vers = 1.2.14b\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 = 87.0\n! Rel Azimuth Max = 138.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.5\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.0\n! LI Light Sigma = 2.9\n! LT Dark Window = 11\n! LT Light Window = 5\n! LT Dark Sigma = 3.5\n! LT Light Sigma = 2.9\n! FRM Pathway = FRM-Full-Characterization\n! Thermal Source = Internal_Thermistor\n! Default Salt = 38.0\n! Default SST = 28.0\n! Default AOD = 0.2\n! Default Wind = 5.0\n! Default AirTemp = 26.0\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.cfg‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,39 @@
33
"outDir": "./Data",
44
"ancFileDir": "./Data/Sample_Data",
55
"ancFile": "",
6-
"CalibrationFiles": {},
7-
"SensorType": "SeaBird",
6+
"CalibrationFiles": {
7+
"SAM_8329.ini": {
8+
"enabled": true,
9+
"frameType": "ES"
10+
},
11+
"SAM_8166.ini": {
12+
"enabled": true,
13+
"frameType": "LI"
14+
},
15+
"SAM_8595.ini": {
16+
"enabled": true,
17+
"frameType": "LT"
18+
}
19+
},
20+
"SensorType": "TriOS",
821
"fL1aUTCOffset": 0.0,
922
"bL1aCleanSZA": 1,
1023
"fL1aCleanSZAMax": 70.0,
1124
"bL1aCOD": 0,
12-
"bL1aqcSunTracker": 1,
13-
"bL1aqcCleanPitchRoll": 1,
25+
"bL1aqcSunTracker": 0,
26+
"bL1aqcCleanPitchRoll": 0,
1427
"fL1aqcPitchRollPitch": 5.0,
1528
"fL1aqcPitchRollRoll": 5.0,
1629
"fL1aqcRotatorHomeAngle": 0.0,
17-
"bL1aqcRotatorDelay": 1,
30+
"bL1aqcRotatorDelay": 0,
1831
"fL1aqcRotatorDelay": 2.0,
1932
"bL1aqcRotatorAngle": 0,
2033
"fL1aqcRotatorAngleMin": -40.0,
2134
"fL1aqcRotatorAngleMax": 40.0,
2235
"bL1aqcCleanSunAngle": 1,
2336
"fL1aqcSunAngleMin": 90.0,
2437
"fL1aqcSunAngleMax": 135.0,
25-
"bL1aqcDeglitch": 1,
38+
"bL1aqcDeglitch": 0,
2639
"fL1aqcESWindowDark": 11,
2740
"fL1aqcESWindowLight": 5,
2841
"fL1aqcESSigmaDark": 3.2,
@@ -55,7 +68,7 @@
5568
"fL1aqcLTMinMaxBandDark": null,
5669
"fL1aqcLTMinMaxBandLight": null,
5770
"fL1aqcAnomalyStep": 20,
58-
"bL1bGetAnc": 0,
71+
"bL1bGetAnc": 1,
5972
"fL1bDefaultWindSpeed": 5.0,
6073
"fL1bDefaultAOD": 0.2,
6174
"fL1bDefaultAirT": 26.0,
@@ -75,7 +88,7 @@
7588
"chooseCal_LT": null,
7689
"chooseCal_LI": null,
7790
"fL1bInterpInterval": 3.3,
78-
"bL1bPlotTimeInterp": 0,
91+
"bL1bPlotTimeInterp": 1,
7992
"fL1bPlotInterval": 20.0,
8093
"bL1bqcLtUVNIR": 1,
8194
"fL1bqcMaxWind": 10.0,
@@ -86,7 +99,7 @@
8699
"fL1bqcSpecFilterEs": 5.0,
87100
"fL1bqcSpecFilterLi": 8.0,
88101
"fL1bqcSpecFilterLt": 3.0,
89-
"bL1bqcEnableQualityFlags": 0,
102+
"bL1bqcEnableQualityFlags": 1,
90103
"fL1bqcCloudFlag": 1.0,
91104
"fL1bqcSignificantEsFlag": 2.0,
92105
"fL1bqcDawnDuskFlag": 1.0,
@@ -106,7 +119,7 @@
106119
"bL2NegativeSpec": 1,
107120
"bL2BRDF": 0,
108121
"bL2BRDF_fQ": 0,
109-
"bL2BRDF_IOP": 1,
122+
"bL2BRDF_IOP": 0,
110123
"bL2BRDF_O23": 0,
111124
"bL2WeightMODISA": 1,
112125
"bL2WeightSentinel3A": 0,
@@ -123,16 +136,15 @@
123136
"seaBASSHeaderFileName": "sample_TRIOS_NOTRACKER.hdr",
124137
"bL2SaveSeaBASS": 1,
125138
"bL2WriteReport": 0,
126-
"bL2EnableQualityFlags": 0,
127-
"FidRadDB": 1,
139+
"bL2EnableQualityFlags": 1,
128140
"bL2PlotProd": 1,
129141
"bL2Prodoc3m": 1,
130142
"bL2Prodkd490": 0,
131143
"bL2Prodpic": 0,
132144
"bL2Prodpoc": 0,
133145
"bL2Prodipar": 0,
134-
"bL2Prodavw": 0,
135-
"bL2Prodqwip": 0,
146+
"bL2Prodavw": 1,
147+
"bL2Prodqwip": 1,
136148
"bL2ProdweiQA": 0,
137149
"bL2Prodgocad": 0,
138150
"bL2Prodag": 0,

‎Config/sample_TRIOS_NOTRACKER.hdr‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "R1",
3+
"investigators": "Giorgio_DallOlmo",
4+
"affiliations": "Plymouth_Marine_Laboratory",
5+
"contact": "gdal@pml.ac.uk",
6+
"experiment": "FRM4SOC2",
7+
"cruise": "FICE22",
8+
"platform": "AAOT",
9+
"documents": "README.md",
10+
"instrument_manufacturer": "TriOS",
11+
"instrument_model": "RAMSES",
12+
"calibration_date": "20220101",
13+
"calibration_files": "Back_SAM_8166.dat,Cal_SAM_8166.dat,SAM_8329.ini,Back_SAM_8329.dat,Cal_SAM_8329.dat,SAM_8166.ini,SAM_8595.ini,Back_SAM_8595.dat,Cal_SAM_8595.dat",
14+
"data_type": "above_water",
15+
"data_status": "preliminary",
16+
"water_depth": "NA",
17+
"measurement_depth": "0",
18+
"cloud_percent": "NA",
19+
"wave_height": "NA",
20+
"secchi_depth": "NA",
21+
"wind_speed": "NA",
22+
"station": "",
23+
"data_file_name": "",
24+
"original_file_name": "",
25+
"start_date": "",
26+
"end_date": "",
27+
"start_time": "",
28+
"end_time": "",
29+
"north_latitude": "",
30+
"south_latitude": "",
31+
"east_longitude": "",
32+
"west_longitude": "",
33+
"nadir": "40",
34+
"rho_correction": "M99",
35+
"NIR_residual_correction": "R06",
36+
"BRDF_correction": "noBRDF",
37+
"comments": "! HyperInSPACE vers = 1.2.14b\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 = Factory_Calibration\n! Thermal Source = Internal_Thermistor\n! Default Salt = 35.0\n! Default SST = 26.0\n! Default AOD = 0.2\n! Default Wind = 5.0\n! Default AirTemp = 26.0\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",
38+
"other_comments": "!\n! Other comments...\n!",
39+
"missing": -9999,
40+
"delimiter": "comma"
41+
}

0 commit comments

Comments
 (0)