Skip to content
Snippets Groups Projects
Commit c541c5a9 authored by Destiny Kuehn's avatar Destiny Kuehn Committed by Maeva Pourpoint
Browse files

Issue 33: Removed trillium compact/240 options from NRL Wizard

parent 2f3433d0
No related branches found
No related tags found
1 merge request!29Issue 33: Removed trillium compact/240 options from NRL Wizard
package: package:
name: nexus-passoft name: nexus-passoft
version: "2023.4.4.0" version: "2023.4.5.0"
source: source:
path: ../ path: ../
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
__author__ = """IRIS PASSCAL""" __author__ = """IRIS PASSCAL"""
__email__ = 'software-support@passcal.nmt.edu' __email__ = 'software-support@passcal.nmt.edu'
__version__ = '2023.4.4.0' __version__ = '2023.4.5.0'
...@@ -210,28 +210,12 @@ def load(filename = defaultsfile): ...@@ -210,28 +210,12 @@ def load(filename = defaultsfile):
def create_defaults(): def create_defaults():
s = Sensor('Na') s = Sensor('Na')
sensors.append(s) sensors.append(s)
s = Sensor('CMG-3T') s = Sensor('CMG-3T')
s.NRL_keys = ('Guralp', 'CMG-3T', '120s - 50Hz', '1500') s.NRL_keys = ('Guralp', 'CMG-3T', '120s - 50Hz', '1500')
sensors.append(s) sensors.append(s)
s = Sensor('CMG-40T')
s.NRL_keys = ('Guralp', 'CMG-40T', '30s - 50 Hz', '800')
sensors.append(s)
s = Sensor('Trillium 40') s = Sensor('Trillium 40')
s.NRL_keys = ('Nanometrics', 'Trillium 40') s.NRL_keys = ('Nanometrics', 'Trillium 40')
sensors.append(s) sensors.append(s)
s = Sensor('Trillium 120 Compact')
s.NRL_keys = ('Nanometrics', 'Trillium Compact', '120 s')
sensors.append(s)
s = Sensor('Trillium 240 gen1')
s.NRL_keys = ('Nanometrics', 'Trillium 240', '1 - serial numbers < 400')
sensors.append(s)
s = Sensor('Trillium 240 gen2')
s.NRL_keys = ('Nanometrics', 'Trillium 240', '2 - serial numbers >= 400')
sensors.append(s)
s = Sensor('L-22') s = Sensor('L-22')
s.NRL_keys = ('Sercel/Mark Products', 'L-22D', '5470 Ohms', '20000 Ohms') s.NRL_keys = ('Sercel/Mark Products', 'L-22D', '5470 Ohms', '20000 Ohms')
sensors.append(s) sensors.append(s)
...@@ -247,13 +231,11 @@ def create_defaults(): ...@@ -247,13 +231,11 @@ def create_defaults():
d = DataLogger('Na') d = DataLogger('Na')
dataloggers.append(d) dataloggers.append(d)
d = DataLogger('RT-130') d = DataLogger('RT-130')
d.NRL_keys = ('REF TEK', 'RT 130 & 130-SMA', PlaceHolder.GAIN, PlaceHolder.SR) d.NRL_keys = ('REF TEK', 'RT 130 & 130-SMA', PlaceHolder.GAIN, PlaceHolder.SR)
d.soh_resps['LOG'] = None d.soh_resps['LOG'] = None
d.soh_resps['VM'] = 'RT130_VM_RESP' d.soh_resps['VM'] = 'RT130_VM_RESP'
dataloggers.append(d) dataloggers.append(d)
d = DataLogger('Q330') d = DataLogger('Q330')
d.NRL_keys = ('Quanterra', 'Q330SR', PlaceHolder.GAIN, PlaceHolder.SR, 'LINEAR AT ALL SPS') d.NRL_keys = ('Quanterra', 'Q330SR', PlaceHolder.GAIN, PlaceHolder.SR, 'LINEAR AT ALL SPS')
d.soh_resps['ACE'] = None d.soh_resps['ACE'] = None
......
...@@ -50,6 +50,6 @@ setup( ...@@ -50,6 +50,6 @@ setup(
packages=find_packages(include=['nexus']), packages=find_packages(include=['nexus']),
test_suite='tests', test_suite='tests',
url='https://git.passcal.nmt.edu/software_public/passoft/nexus', url='https://git.passcal.nmt.edu/software_public/passoft/nexus',
version='2023.4.4.0', version='2023.4.5.0',
zip_safe=False, zip_safe=False,
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment