diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 682cfd40368c261dd8597529eff44683f4d88262..e75eb654549b124edfa552b2ad751bf975eea441 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: nexus-passoft - version: "2023.4.4.0" + version: "2023.4.5.0" source: path: ../ diff --git a/nexus/__init__.py b/nexus/__init__.py index cb661680e72c6081e9826f7b47e815023bde5644..001e7f1fc0faee12d16b91434b76203897d81aed 100644 --- a/nexus/__init__.py +++ b/nexus/__init__.py @@ -4,4 +4,4 @@ __author__ = """IRIS PASSCAL""" __email__ = 'software-support@passcal.nmt.edu' -__version__ = '2023.4.4.0' +__version__ = '2023.4.5.0' diff --git a/nexus/hardware.py b/nexus/hardware.py index 963596c69c0e86fe7ca46a30e58cdafc497abf26..c255785df0f9064c819b40e241b1f31661a7c2ac 100644 --- a/nexus/hardware.py +++ b/nexus/hardware.py @@ -210,28 +210,12 @@ def load(filename = defaultsfile): def create_defaults(): s = Sensor('Na') sensors.append(s) - s = Sensor('CMG-3T') s.NRL_keys = ('Guralp', 'CMG-3T', '120s - 50Hz', '1500') 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.NRL_keys = ('Nanometrics', 'Trillium 40') 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.NRL_keys = ('Sercel/Mark Products', 'L-22D', '5470 Ohms', '20000 Ohms') sensors.append(s) @@ -247,13 +231,11 @@ def create_defaults(): d = DataLogger('Na') dataloggers.append(d) - d = DataLogger('RT-130') d.NRL_keys = ('REF TEK', 'RT 130 & 130-SMA', PlaceHolder.GAIN, PlaceHolder.SR) d.soh_resps['LOG'] = None d.soh_resps['VM'] = 'RT130_VM_RESP' dataloggers.append(d) - d = DataLogger('Q330') d.NRL_keys = ('Quanterra', 'Q330SR', PlaceHolder.GAIN, PlaceHolder.SR, 'LINEAR AT ALL SPS') d.soh_resps['ACE'] = None diff --git a/setup.py b/setup.py index 5b7586c83e85956e71b6507ae607f25355689215..775e43ce2183a08b18af84eac2b35dc1fab584f6 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( packages=find_packages(include=['nexus']), test_suite='tests', url='https://git.passcal.nmt.edu/software_public/passoft/nexus', - version='2023.4.4.0', + version='2023.4.5.0', zip_safe=False, )