Commit 6fd97ffb authored by Florian Obersteiner's avatar Florian Obersteiner
Browse files

pre-commit now working?!

parent 775a1573
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v4.1.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
......@@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
......@@ -17,12 +17,12 @@
# -- Project information -----------------------------------------------------
project = 'ICARTT'
copyright = '2022, Christoph Knote'
author = 'Christoph Knote'
project = "ICARTT"
copyright = "2022, Christoph Knote"
author = "Christoph Knote"
# The full version, including alpha/beta/rc tags
release = '2.0'
release = "2.0"
# -- General configuration ---------------------------------------------------
......@@ -30,10 +30,10 @@ release = '2.0'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.autodoc', 'enum_tools.autoenum']
extensions = ["sphinx.ext.autodoc", "enum_tools.autoenum"]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
......@@ -46,9 +46,9 @@ exclude_patterns = []
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'classic'
html_theme = "classic"
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = []
\ No newline at end of file
html_static_path = []
Reading an existing dataset
Reading an existing dataset
############################
Simple format (FFI 1001)
......@@ -13,7 +13,7 @@ Identical to FFI1001, only the data structure is more complex:
.. literalinclude:: ../tests/usage_examples/read_ffi2110.py
Creating a new dataset
Creating a new dataset
############################
Simple format (FFI 1001)
......
......@@ -26,6 +26,7 @@ packages = [
{ include = "icartt", from = "src" },
]
[tool.poetry.urls]
issues = "http://mbees.med.uni-augsburg.de/gitlab/mbees/icartt_pypackage/issues"
......@@ -34,6 +35,7 @@ issues = "http://mbees.med.uni-augsburg.de/gitlab/mbees/icartt_pypackage/issues"
python = ">=3.8,<4"
numpy = ">= 1.12"
[tool.poetry.dev-dependencies]
pytest = "^5.2"
coverage = ">= 6.3.2"
......@@ -41,6 +43,11 @@ sphinx = ">= 4.4"
sphinx-rtd-theme = ">= 1.0"
enum-tools = ">= 0.9"
sphinx-toolbox = ">= 2.16.0"
black = "^22.3.0"
[tool.black]
[build-system]
requires = ["poetry-core>=1.0.0"]
......
/.coverage
\ No newline at end of file
/.coverage
......@@ -21,7 +21,7 @@ PLATFORM: dc8
LOCATION: Latitude, Longitude, and Altitude included in data records
ASSOCIATED_DATA: N/A
INSTRUMENT_INFO: N/A
DATA_INFO:
DATA_INFO:
UNCERTAINTY: N/A
ULOD_FLAG: -77777
ULOD_VALUE: N/A
......@@ -29,10 +29,10 @@ LLOD_FLAG: -88888
LLOD_VALUE: N/A
DM_CONTACT_INFO: emmons@ucar.edu
PROJECT_INFO: KORUS-AQ
STIPULATIONS_ON_USE:
OTHER_COMMENTS:
STIPULATIONS_ON_USE:
OTHER_COMMENTS:
REVISION: RA
RA: flight plan
RA: flight plan
UTC, Lat, Lon, Alt_km, Alt_ft
82800, 37.090599, 127.029602, 0.000, 0.0
82860, 37.131680, 127.087479, 0.061, 200.0
......
......@@ -16,10 +16,10 @@ Acetaldehyde_ppbv, ppbv, Acetaldehyde, volume mixing ratio
Acetaldehyde_uncertainty_ppbv, ppbv, UncertaintyData, volume mixing ratio
0
26
PI_CONTACT_INFO: Institut fuer Ionenphysik und Angewandte Physik,
PI_CONTACT_INFO: Institut fuer Ionenphysik und Angewandte Physik,
Technikerstrasse 25, 6020 Innsbruck, AUSTRIA
PLATFORM: NASA DC-8 Aircraft
LOCATION: Latitude, longitude and elevation data are included the corresponding
LOCATION: Latitude, longitude and elevation data are included the corresponding
“seac4rs-dc8hskping” files
ASSOCIATED_DATA: N/A
INSTRUMENT_INFO: Proton Transfer Reaction Mass Spectrometer
......@@ -29,14 +29,14 @@ ULOD_FLAG: -7777
ULOD_VALUE: N/A
LLOD_FLAG: -8888
LLOD_VALUE: N/A
DM_CONTACT_INFO: Armin Wisthaler, Institut fuer Ionenphysik und Angewandte
Physik, Technikerstrasse 25, 6020 Innsbruck, AUSTRIA; email:
DM_CONTACT_INFO: Armin Wisthaler, Institut fuer Ionenphysik und Angewandte
Physik, Technikerstrasse 25, 6020 Innsbruck, AUSTRIA; email:
armin.wisthaler@uibk.ac.at
PROJECT_INFO: SEAC4RS
STIPULATIONS_ON_USE: The users are strongly encouraged to consult with the PI
STIPULATIONS_ON_USE: The users are strongly encouraged to consult with the PI
for proper data use.
OTHER_COMMENTS: Data have not been synchronized with the DLH water signal
because of DLH timing issues. If exact synchronization is critical for the analysis, the
OTHER_COMMENTS: Data have not been synchronized with the DLH water signal
because of DLH timing issues. If exact synchronization is critical for the analysis, the
user must develop and apply own method of synchronization.
REVISION: R1
R1: Final data.
......
......@@ -12,13 +12,13 @@ Start_UTC, seconds, Time_Start, elapsed time from 0000 UTC
1.0, 1.0, 1.0, 1E+21
-99999, -99999, -99999, -99999
Temperature[], K, Temperature, Temperature_array
Temperture_SE[], K, Temperature_Standard_Error, Temperature_Standard_Error_array
Geometric_altitude[], meters, Geometric_Altitude, Geometric_Altitude_array
Temperture_SE[], K, Temperature_Standard_Error, Temperature_Standard_Error_array
Geometric_altitude[], meters, Geometric_Altitude, Geometric_Altitude_array
Molecular_air_density[], number_per_cubic_meter, Molecular_air_density, Molecular_air_density_array
17
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
-9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999
NZ, none, number_of_altitudes_in_data_record
NZ, none, number_of_altitudes_in_data_record
Stop_UTC, seconds, Time_Stop, end of scan
Mid_UTC, seconds, Time_Mid, horizon location of scan
Zp, km, Pressure_altitude
......@@ -36,10 +36,10 @@ MRI, none, Retrieval_quality_metric
Tcp, K, Cold_point_temperature
Zcp, km, Cold_point_pressure_altitude
1
*** Preliminary Data Preliminary Data Preliminary Data Preliminary Data Preliminary Data ***
*** Preliminary Data Preliminary Data Preliminary Data Preliminary Data Preliminary Data ***
19
Here's a brief free-form tutorial on how to decipher the MTP data:
Data groups consist of the following group of lines per 15-second observing cycle.
Data groups consist of the following group of lines per 15-second observing cycle.
First line is: UTstart, number of retrieval levels, UTend, UTmid, Pressure Altitude, Pitch, Roll, Outside air temp (K), tropopause altitude #1 (km), tropopause altitude #2 (km) [if present], potential temperatures of tropopause #1 and #2, latitude, longitude, & lapse rate near flight level.
Remaining set of lines for each cycle consist of 5 columns: col#1 is pressure altitude (meters), col#2 is temperature from MTP (Kelvin), col#3 is temperature error estimate (K), col#4 is geometric altitude (meters), based on GPS altitude (meters), and col#5 is molecular air density [1E+21/m3].
PI_CONTACT_INFO: M/S 246-102; Jet Propulsion Laboratory; Pasadena, CA 91109- 8099; Michael.J.Mahoney@jpl.nasa.gov
......@@ -61,30 +61,30 @@ Start_UTC, NZ, Stop_UTC, Mid_UTC, Zp, Pitch, Roll, OAT, Zt1, Zt2, PTt1, PTt2, La
77394, 0, 77407, 77399, 6.618, 11.9, -0.6, 259.7, -9999, -9999, -9999, -9999, 34.792, -118.171, -9999, 0.17, 202.05, 15.62
77407, 13, 77420, 77412, 6.790, 6.1, 0.2, 258.2, 15.2, 99.9, 373.2, 999.9, 34.805, -118.177, -6.7, 0.21, 201.61, 15.79
13690, 208.0, 1.4, 14295, 5150
10790, 229.1, 1.0, 11364, 7387
10790, 229.1, 1.0, 11364, 7387
9290, 241.3, 0.8, 9775, 8827
8390, 248.4, 0.7, 8816, 9799
7790, 252.3, 0.5, 8176, 10526
7290, 255.6, 0.4, 7643, 11160
6940, 257.9, 0.2, 7270, 11623
6640, 259.7, 0.3, 6950, 12035
6290, 262.3, 0.5, 6577, 12512
5790, 265.6, 0.8, 6045, 13239
5211, 269.0, 1.0, 5429, 14142
4343, 274.6, 1.0, 4506, 15559
8390, 248.4, 0.7, 8816, 9799
7790, 252.3, 0.5, 8176, 10526
7290, 255.6, 0.4, 7643, 11160
6940, 257.9, 0.2, 7270, 11623
6640, 259.7, 0.3, 6950, 12035
6290, 262.3, 0.5, 6577, 12512
5790, 265.6, 0.8, 6045, 13239
5211, 269.0, 1.0, 5429, 14142
4343, 274.6, 1.0, 4506, 15559
1834, 288.6, 9.1, 1839, 20460
77621, 14, 77634, 77626, 10.279, 6.1, -0.1, 230.2, 15.0, 99.9, 386.7, 999.9, 35.058, -118.258, -5.1, 0.32, 210.34, 15.48
17179, 211.0, 1.3, 17650, 2929
14279, 213.0, 1.4, 14814, 4582
12779, 218.4, 1.1, 13314, 5662
11879, 221.8, 0.8, 12397, 6425
11279, 225.0, 0.5, 11776, 6963
10779, 228.1, 0.3, 11252, 7433
10429, 229.9, 0.2, 10885, 7789
10129, 231.3, 0.2, 10571, 8109
14279, 213.0, 1.4, 14814, 4582
12779, 218.4, 1.1, 13314, 5662
11879, 221.8, 0.8, 12397, 6425
11279, 225.0, 0.5, 11776, 6963
10779, 228.1, 0.3, 11252, 7433
10429, 229.9, 0.2, 10885, 7789
10129, 231.3, 0.2, 10571, 8109
9779, 233.2, 0.3, 10206, 8485
9279, 236.2, 0.4, 9686, 9034
8679, 240.0, 0.6, 9062, 9720
7779, 246.8, 0.8, 8125, 10777
6279, 259.0, 0.9, 6554, 12691
9279, 236.2, 0.4, 9686, 9034
8679, 240.0, 0.6, 9062, 9720
7779, 246.8, 0.8, 8125, 10777
6279, 259.0, 0.9, 6554, 12691
3779, 279.4, 1.2, 3910, 16472
......@@ -12,32 +12,32 @@ UTC, seconds, Time_Start, number of seconds from 00:00 UTC
0.1, 0.0001, 0.1, 0.01, 0.0001, 0.1, 0.0001
-999999, -999999, -999999, -999999, -999999, -999999, -999999
TempK[], K, Temperature, Temperature_array
Log10_NumDensity[], part/cc, Log10_NumDensity, Log10_NumDensity_array
Log10_NumDensity[], part/cc, Log10_NumDensity, Log10_NumDensity_array
TempK_Err[], K, Temperature_Error, Temperature_error_array
AerKlet[], Klet, Aerosol, Aerosol_array
Log10_O3NumDensity[], part/cc, Log10_O3NumDensity, Log10_Ozone_NumDensity_array
O3_MR[], ppb, Ozone_mixing_ratio, Ozone_mixing_ratio_array
O3_MR[], ppb, Ozone_mixing_ratio, Ozone_mixing_ratio_array
Log10_O3NumDensity_Err[], part/cc, Log10_O3NumDensity_Error, Log10_NumDensity_error_array
11
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999
-9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999
NumAlts, #, Number_of_altitudes, Number_of_altitudes_reported
Year, yyyy, Year_UTC, Year_UTC
Month, mm, Month_UTC, Month_UTC
Day, dd, Day_UTC, Day_UTC
AvgTime, minutes, Averaging_time, Averaging_time_of_presented_data xxx.x_minutes
AvgTime, minutes, Averaging_time, Averaging_time_of_presented_data xxx.x_minutes
Lat, degrees, Latitude
Lon, degrees, Longitude
PAlt, meters, pressure_altitude
GPSAlt, meters, GPS_altitude
SAT, K, Static_air_temperature
SZA, degrees, Sun_Zenith_Angle
GPSAlt, meters, GPS_altitude
SAT, K, Static_air_temperature
SZA, degrees, Sun_Zenith_Angle
1
Enter any special comments specific to this flight here
Enter any special comments specific to this flight here
18
PI_CONTACT_INFO: Enter PI Address here
PI_CONTACT_INFO: Enter PI Address here
PLATFORM: NASA DC8
LOCATION: Lat, Lon, and Alt included in the data records
LOCATION: Lat, Lon, and Alt included in the data records
ASSOCIATED_DATA: N/A
INSTRUMENT_INFO:N/A
DATA_INFO:N/A
......@@ -48,21 +48,21 @@ LLOD_FLAG: -8888
LLOD_VALUE: N/A
DM_CONTACT_INFO: Enter Data Manager Info here
PROJECT_INFO: PAVE MISSION: Jan-Feb 2005
STIPULATIONS_ON_USE: Use of these data should be done in consultation with the PI
STIPULATIONS_ON_USE: Use of these data should be done in consultation with the PI
OTHER_COMMENTS: N/A
REVISION: R0
R0: Version 2005-0: AROTAL T & O3 Rayleigh Retrievals.
UTC, NumAlts, Year, Month, Day, AvgTime, Lat, Lon, PAlt, GpsAlt, SAT, SZA, Altitude[], TempK[], Log10_NumDensity[], TempK_Err[], AerKlet[], Log10_O3NumDensity[], O3_MR[], Log10_O3NumDensity_Err[]
54000, 9, 2005, 2, 3, 0, 42.308, -70.582, 6910, 6979, 242.5, 65.5
9154, -999999, -999999, -999999, -999999, 113178, 212, -999999
9304, -999999, -999999, -999999, -999999, 123353, 2250, -999999
9454, -999999, -999999, -999999, -999999, 123008, 2116, -999999
9604, -999999, -999999, -999999, -999999, 120933, 1337, -999999
9754, -999999, -999999, -999999, -999999, 119675, 1019, -999999
9904, -999999, -999999, -999999, -999999, 122655, 2061, -999999
9154, -999999, -999999, -999999, -999999, 113178, 212, -999999
9304, -999999, -999999, -999999, -999999, 123353, 2250, -999999
9454, -999999, -999999, -999999, -999999, 123008, 2116, -999999
9604, -999999, -999999, -999999, -999999, 120933, 1337, -999999
9754, -999999, -999999, -999999, -999999, 119675, 1019, -999999
9904, -999999, -999999, -999999, -999999, 122655, 2061, -999999
10054, -999999, -999999, -999999, -999999, 124384, 3126, -999999
10204, -999999, -999999, -999999, -999999, 124632, 3371, -999999
10354, -999999, -999999, -999999, -999999, 121341, 1609, -999999
10354, -999999, -999999, -999999, -999999, 121341, 1609, -999999
54001, 8, 2005, 02, 03, 0, 42.278, -70.613, 6978, 7043, 241.7, 65.5
10118, -999999, -999999, -999999, -999999, 124458, 3205, -999999
10268, -999999, -999999, -999999, -999999, 123160, 2421, -999999
......@@ -71,4 +71,4 @@ UTC, NumAlts, Year, Month, Day, AvgTime, Lat, Lon, PAlt, GpsAlt, SAT, SZA, Altit
10718, -999999, -999999, -999999, -999999, 117339, 680, -999999
10868, -999999, -999999, -999999, -999999, 122751, 2423, -999999
11018, -999999, -999999, -999999, -999999, 124230, 3491, -999999
11168, -999999, -999999, -999999, -999999, 124039, 3424, -999999
\ No newline at end of file
11168, -999999, -999999, -999999, -999999, 124039, 3424, -999999
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment