diff --git a/instruments/filereader_registry.py b/instruments/filereader_registry.py index 1d21384..aaa461a 100644 --- a/instruments/filereader_registry.py +++ b/instruments/filereader_registry.py @@ -15,8 +15,9 @@ from instruments.readers.xps_ibw_reader import read_xps_ibw_file_as_dict from instruments.readers.g5505_text_reader import read_txt_files_as_dict from instruments.readers.acsm_tofware_reader import read_acsm_files_as_dict from instruments.readers.acsm_flag_reader import read_jsonflag_as_dict +from instruments.readers.nasa_ames_reader import read_nasa_ames_as_dict -file_extensions = ['.ibw','.txt','.dat','.h5','.TXT','.csv','.pkl','.json','.yaml'] +file_extensions = ['.ibw','.txt','.dat','.h5','.TXT','.csv','.pkl','.json','.yaml','.nas'] # Define the instruments directory (modify this as needed or set to None) default_instruments_dir = None # or provide an absolute path @@ -28,7 +29,8 @@ file_readers = { 'csv': lambda a1: read_txt_files_as_dict(a1, instruments_dir=default_instruments_dir, work_with_copy=False), 'ACSM_TOFWARE_txt' : lambda x: read_acsm_files_as_dict(x, instruments_dir=default_instruments_dir, work_with_copy=False), 'ACSM_TOFWARE_csv' : lambda x: read_acsm_files_as_dict(x, instruments_dir=default_instruments_dir, work_with_copy=False), - 'ACSM_TOFWARE_flags_json' : lambda x: read_jsonflag_as_dict(x)} + 'ACSM_TOFWARE_flags_json' : lambda x: read_jsonflag_as_dict(x), + 'ACSM_TOFWARE_nas' : lambda x: read_nasa_ames_as_dict(x)} REGISTRY_FILE = "registry.yaml" #os.path.join(os.path.dirname(__file__), "registry.yaml") diff --git a/instruments/registry.yaml b/instruments/registry.yaml index 95557ea..759439e 100644 --- a/instruments/registry.yaml +++ b/instruments/registry.yaml @@ -1,75 +1,80 @@ -instruments: - - instrumentFolderName: default - fileExtension: csv - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: null - - - instrumentFolderName: NEXAFS - fileExtension: h5 - fileReaderPath: instruments/readers/hdf5_file_reader.py - InstrumentDictionaryPath: null - - - instrumentFolderName: SES - fileExtension: ibw - fileReaderPath: instruments/readers/xps_ibw_reader.py - InstrumentDictionaryPath: null - - - instrumentFolderName: RGA - fileExtension: txt - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/RGA.yaml - - - instrumentFolderName: Pressure - fileExtension: dat - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/Pressure.yaml - - - instrumentFolderName: Humidity_Sensors - fileExtension: dat - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/Humidity_Sensors.yaml - - - instrumentFolderName: ICAD - fileExtension: dat - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/ICAD.yaml - - - instrumentFolderName: Lopap - fileExtension: dat - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/Lopap.yaml - - - instrumentFolderName: T200_NOx - fileExtension: dat - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/T200_NOx.yaml - - - instrumentFolderName: T360U_CO2 - fileExtension: dat - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/T360U_CO2.yaml - - - instrumentFolderName: htof - fileExtension: h5 - fileReaderPath: null - InstrumentDictionaryPath: null - - - instrumentFolderName: smps - fileExtension: txt - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/smps.yaml - - - instrumentFolderName: gas - fileExtension: txt - fileReaderPath: instruments/readers/g5505_text_reader.py - InstrumentDictionaryPath: instruments/dictionaries/gas.yaml - - - instrumentFolderName: ACSM_TOFWARE - fileExtension: txt - fileReaderPath: instruments/readers/acsm_tofware_reader.py - InstrumentDictionaryPath: instruments/dictionaries/ACSM_TOFWARE.yaml - - - instrumentFolderName: ACSM_TOFWARE - fileExtension: csv - fileReaderPath: instruments/readers/acsm_tofware_reader.py - InstrumentDictionaryPath: instruments/dictionaries/ACSM_TOFWARE.yaml +instruments: + - instrumentFolderName: default + fileExtension: csv + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: null + + - instrumentFolderName: NEXAFS + fileExtension: h5 + fileReaderPath: instruments/readers/hdf5_file_reader.py + InstrumentDictionaryPath: null + + - instrumentFolderName: SES + fileExtension: ibw + fileReaderPath: instruments/readers/xps_ibw_reader.py + InstrumentDictionaryPath: null + + - instrumentFolderName: RGA + fileExtension: txt + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/RGA.yaml + + - instrumentFolderName: Pressure + fileExtension: dat + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/Pressure.yaml + + - instrumentFolderName: Humidity_Sensors + fileExtension: dat + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/Humidity_Sensors.yaml + + - instrumentFolderName: ICAD + fileExtension: dat + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/ICAD.yaml + + - instrumentFolderName: Lopap + fileExtension: dat + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/Lopap.yaml + + - instrumentFolderName: T200_NOx + fileExtension: dat + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/T200_NOx.yaml + + - instrumentFolderName: T360U_CO2 + fileExtension: dat + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/T360U_CO2.yaml + + - instrumentFolderName: htof + fileExtension: h5 + fileReaderPath: null + InstrumentDictionaryPath: null + + - instrumentFolderName: smps + fileExtension: txt + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/smps.yaml + + - instrumentFolderName: gas + fileExtension: txt + fileReaderPath: instruments/readers/g5505_text_reader.py + InstrumentDictionaryPath: instruments/dictionaries/gas.yaml + + - instrumentFolderName: ACSM_TOFWARE + fileExtension: txt + fileReaderPath: instruments/readers/acsm_tofware_reader.py + InstrumentDictionaryPath: instruments/dictionaries/ACSM_TOFWARE.yaml + + - instrumentFolderName: ACSM_TOFWARE + fileExtension: csv + fileReaderPath: instruments/readers/acsm_tofware_reader.py + InstrumentDictionaryPath: instruments/dictionaries/ACSM_TOFWARE.yaml + + - instrumentFolderName: ACSM_TOFWARE + fileExtension: nas + fileReaderPath: instruments/readers/nasa_ames_reader.py + InstrumentDictionaryPath: instruments/dictionaries/EBAS.yaml