diff --git a/assets/dataloggers.csv b/assets/dataloggers.csv
index 45d92d291..7ace66d6b 100644
--- a/assets/dataloggers.csv
+++ b/assets/dataloggers.csv
@@ -148,23 +148,23 @@ GNS Science,SNARE/16,203,,
Johnson-Matheson,JOHNSON-MATHESON,API_1,,
Jones,JONES,TON_1,,
Jones,JONES,WEL_1,,
-Kinemetrics,BASALT 8X DATALOGGER,1625,15109,
-Kinemetrics,BASALT 8X DATALOGGER,1626,15110,
-Kinemetrics,BASALT 8X DATALOGGER,1627,15111,
+Kinemetrics,Basalt/8X,1625,15109,
+Kinemetrics,Basalt/8X,1626,15110,
+Kinemetrics,Basalt/8X,1627,15111,
Kinemetrics,KINEMETRICS PORTABLE RECORDER,PPZ_1,,
-Kinemetrics,Obsidian 4X Datalogger,139,16126,
-Kinemetrics,Obsidian 4X Datalogger,372,16403,
-Kinemetrics,Obsidian 4X Datalogger,373,16404,
-Kinemetrics,Obsidian 4X Datalogger,656,16653,
-Kinemetrics,Obsidian 4X Datalogger,695,16675,
-Kinemetrics,Obsidian 4X Datalogger,709,16670,
-Kinemetrics,Obsidian 4X Datalogger,710,16669,
-Kinemetrics,Obsidian 4X Datalogger,711,16673,
-Kinemetrics,Obsidian 4X Datalogger,712,16677,
-Kinemetrics,Obsidian 4X Datalogger,713,16671,
-Kinemetrics,Obsidian 4X Datalogger,714,16674,
-Kinemetrics,Obsidian 4X Datalogger,715,16676,
-Kinemetrics,Obsidian 4X Datalogger,716,16672,
+Kinemetrics,Obsidian/4X,139,16126,
+Kinemetrics,Obsidian/4X,372,16403,
+Kinemetrics,Obsidian/4X,373,16404,
+Kinemetrics,Obsidian/4X,656,16653,
+Kinemetrics,Obsidian/4X,695,16675,
+Kinemetrics,Obsidian/4X,709,16670,
+Kinemetrics,Obsidian/4X,710,16669,
+Kinemetrics,Obsidian/4X,711,16673,
+Kinemetrics,Obsidian/4X,712,16677,
+Kinemetrics,Obsidian/4X,713,16671,
+Kinemetrics,Obsidian/4X,714,16674,
+Kinemetrics,Obsidian/4X,715,16676,
+Kinemetrics,Obsidian/4X,716,16672,
Kinemetrics,Q330/3,1177,10127,
Kinemetrics,Q330/3,1178,10128,
Kinemetrics,Q330/3,1179,10121,
diff --git a/install/channels.csv b/install/channels.csv
index 59221ea31..a6ac4ae46 100644
--- a/install/channels.csv
+++ b/install/channels.csv
@@ -21,15 +21,15 @@ GNS Science,EARSS/3,Datalogger,,50,datalogger_GNS-Science_Earss_22bits_50sps
GNS Science,EARSS/3,Datalogger,,100,datalogger_GNS-Science_Earss_22bits_100sps
Kinemetrics,BASALT,Strong Motion Recorder,,50,datalogger_Kinemetrics_Basalt_26bits_50sps
Kinemetrics,BASALT,Strong Motion Recorder,,200,datalogger_Kinemetrics_Basalt_26bits_200sps
-Kinemetrics,BASALT 8X DATALOGGER,Strong Motion Recorder,,50,datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_50sps
-Kinemetrics,BASALT 8X DATALOGGER,Strong Motion Recorder,,200,datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_200sps
+Kinemetrics,Basalt/8X,Strong Motion Recorder,,50,datalogger_Kinemetrics_Basalt8X_26bits_50sps
+Kinemetrics,Basalt/8X,Strong Motion Recorder,,200,datalogger_Kinemetrics_Basalt8X_26bits_200sps
Kinemetrics,ETNA,Strong Motion Recorder,,200,datalogger_Kinemetrics_Etna_27bits_200sps
Kinemetrics,ETNA 2,Strong Motion Recorder,,200,datalogger_Kinemetrics_ETNA2_27bits_200sps
Kinemetrics,K2,Strong Motion Recorder,,200,datalogger_Kinemetrics_K2_27bits_200sps
Kinemetrics,OBSIDIAN,Strong Motion Recorder,,50,datalogger_Kinemetrics_Obsidian_26bits_50sps
Kinemetrics,OBSIDIAN,Strong Motion Recorder,,200,datalogger_Kinemetrics_Obsidian_26bits_200sps
-Kinemetrics,Obsidian 4X Datalogger,Strong Motion Recorder,,50,datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_50sps
-Kinemetrics,Obsidian 4X Datalogger,Strong Motion Recorder,,200,datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_200sps
+Kinemetrics,Obsidian/4X,Strong Motion Recorder,,50,datalogger_Kinemetrics_Obsidian4X_24bits_50sps
+Kinemetrics,Obsidian/4X,Strong Motion Recorder,,200,datalogger_Kinemetrics_Obsidian4X_24bits_200sps
Kinemetrics,Q330/3,Datalogger,,-10,datalogger_Kinemetrics_Q330_24bits_10s
Kinemetrics,Q330/3,Datalogger,,1,datalogger_Kinemetrics_Q330_24bits_1s
Kinemetrics,Q330/3,Datalogger,,10,datalogger_Kinemetrics_Q330_24bits_10sps
diff --git a/install/dataloggers.csv b/install/dataloggers.csv
index 435de43f9..989b75135 100644
--- a/install/dataloggers.csv
+++ b/install/dataloggers.csv
@@ -400,23 +400,23 @@ GNS Science,SNARE/16,200,Havelock North HortResearch,SNARE Network,1989-08-05T06
GNS Science,SNARE/16,202,Wellington Dominion Observatory,SNARE Network,1986-09-22T00:00:00Z,1998-03-02T02:00:00Z
Guralp,GURALP-SAM-RECORDER,S0125,Tongariro River,,2001-01-16T08:00:00Z,2001-06-20T03:05:00Z
Guralp,GURALP-SAM-RECORDER,S0143,Wharepipi,,2001-01-27T14:01:00Z,2001-06-17T07:30:00Z
-Kinemetrics,BASALT 8X DATALOGGER,1625,Richmond Hill Borehole,,2013-07-03T00:00:03Z,2014-07-22T03:00:00Z
-Kinemetrics,BASALT 8X DATALOGGER,1625,Richmond Hill Borehole,,2014-10-30T00:30:01Z,2015-09-22T00:30:05Z
-Kinemetrics,BASALT 8X DATALOGGER,1626,Richmond Hill Borehole,,2013-01-28T00:00:01Z,2013-06-04T01:00:00Z
-Kinemetrics,BASALT 8X DATALOGGER,1626,Redcliffs Borehole,,2013-09-03T00:00:01Z,9999-01-01T00:00:00Z
-Kinemetrics,BASALT 8X DATALOGGER,1627,Redcliffs Borehole,,2013-01-28T00:00:01Z,2013-09-03T00:00:00Z
-Kinemetrics,BASALT 8X DATALOGGER,1627,Richmond Hill Borehole,,2014-07-22T03:00:01Z,2014-10-30T00:30:00Z
-Kinemetrics,Obsidian 4X Datalogger,139,Deep Cove,Strong Motion,2015-10-22T05:00:01Z,2020-06-23T00:48:00Z
-Kinemetrics,Obsidian 4X Datalogger,372,Waikawa Valley,Strong Motion,2017-05-22T06:17:01Z,9999-01-01T00:00:00Z
-Kinemetrics,Obsidian 4X Datalogger,373,Kokohu,Strong Motion,2017-05-30T02:45:01Z,2021-06-02T21:56:00Z
-Kinemetrics,Obsidian 4X Datalogger,373,Wharekauri,Strong Motion,2021-11-24T19:37:00Z,9999-01-01T00:00:00Z
-Kinemetrics,Obsidian 4X Datalogger,656,Raoul Island Met Station,Strong Motion,2016-09-17T13:00:01Z,2023-01-28T21:16:00Z
-Kinemetrics,Obsidian 4X Datalogger,695,Milford Sound,Strong Motion,2017-05-23T04:15:01Z,9999-01-01T00:00:00Z
-Kinemetrics,Obsidian 4X Datalogger,709,Deep Cove,Strong Motion,2020-06-23T01:09:00Z,2021-08-09T21:08:00Z
-Kinemetrics,Obsidian 4X Datalogger,710,Puysegur Point,Strong Motion,2017-01-19T21:20:01Z,9999-01-01T00:00:00Z
-Kinemetrics,Obsidian 4X Datalogger,713,Glynn Wye,Strong Motion,2019-10-23T19:45:00Z,2020-07-23T20:19:00Z
-Kinemetrics,Obsidian 4X Datalogger,715,Wakarara,Strong Motion,2019-09-10T02:50:00Z,2021-05-25T20:54:00Z
-Kinemetrics,Obsidian 4X Datalogger,716,The Sugar Loaf Quarry,Strong Motion,2017-03-16T00:00:01Z,9999-01-01T00:00:00Z
+Kinemetrics,Basalt/8X,1625,Richmond Hill Borehole,,2013-07-03T00:00:03Z,2014-07-22T03:00:00Z
+Kinemetrics,Basalt/8X,1625,Richmond Hill Borehole,,2014-10-30T00:30:01Z,2015-09-22T00:30:05Z
+Kinemetrics,Basalt/8X,1626,Richmond Hill Borehole,,2013-01-28T00:00:01Z,2013-06-04T01:00:00Z
+Kinemetrics,Basalt/8X,1626,Redcliffs Borehole,,2013-09-03T00:00:01Z,9999-01-01T00:00:00Z
+Kinemetrics,Basalt/8X,1627,Redcliffs Borehole,,2013-01-28T00:00:01Z,2013-09-03T00:00:00Z
+Kinemetrics,Basalt/8X,1627,Richmond Hill Borehole,,2014-07-22T03:00:01Z,2014-10-30T00:30:00Z
+Kinemetrics,Obsidian/4X,139,Deep Cove,Strong Motion,2015-10-22T05:00:01Z,2020-06-23T00:48:00Z
+Kinemetrics,Obsidian/4X,372,Waikawa Valley,Strong Motion,2017-05-22T06:17:01Z,9999-01-01T00:00:00Z
+Kinemetrics,Obsidian/4X,373,Kokohu,Strong Motion,2017-05-30T02:45:01Z,2021-06-02T21:56:00Z
+Kinemetrics,Obsidian/4X,373,Wharekauri,Strong Motion,2021-11-24T19:37:00Z,9999-01-01T00:00:00Z
+Kinemetrics,Obsidian/4X,656,Raoul Island Met Station,Strong Motion,2016-09-17T13:00:01Z,2023-01-28T21:16:00Z
+Kinemetrics,Obsidian/4X,695,Milford Sound,Strong Motion,2017-05-23T04:15:01Z,9999-01-01T00:00:00Z
+Kinemetrics,Obsidian/4X,709,Deep Cove,Strong Motion,2020-06-23T01:09:00Z,2021-08-09T21:08:00Z
+Kinemetrics,Obsidian/4X,710,Puysegur Point,Strong Motion,2017-01-19T21:20:01Z,9999-01-01T00:00:00Z
+Kinemetrics,Obsidian/4X,713,Glynn Wye,Strong Motion,2019-10-23T19:45:00Z,2020-07-23T20:19:00Z
+Kinemetrics,Obsidian/4X,715,Wakarara,Strong Motion,2019-09-10T02:50:00Z,2021-05-25T20:54:00Z
+Kinemetrics,Obsidian/4X,716,The Sugar Loaf Quarry,Strong Motion,2017-03-16T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,1177,Mount Edgecumbe,,2007-05-31T03:00:01Z,2008-06-30T23:50:00Z
Kinemetrics,Q330/3,1177,Rawiri Station,,2009-06-10T03:30:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,1178,Blackbirch Station,,2006-01-18T20:30:01Z,2016-12-08T00:00:00Z
diff --git a/meta/testdata/models.csv b/meta/testdata/models.csv
index 6a9e98fc2..cc005b9af 100644
--- a/meta/testdata/models.csv
+++ b/meta/testdata/models.csv
@@ -1,3 +1,3 @@
Make,Model,Type
General Electric,Druck PTX-1830,Pressure Sensor
-Kinemetrics,BASALT 8X DATALOGGER,Datalogger
+Kinemetrics,Basalt/8X,Datalogger
diff --git a/resp/auto.go b/resp/auto.go
index e4bf0447d..81261772b 100644
--- a/resp/auto.go
+++ b/resp/auto.go
@@ -19,13 +19,6 @@ var DataloggerModels map[string]DataloggerModel = map[string]DataloggerModel{
Manufacturer: "Kinemetrics",
Vendor: "",
},
- "BASALT 8X DATALOGGER": {
- Name: "BASALT 8X DATALOGGER",
- Type: "Strong Motion Recorder",
- Description: "Kinemetrics BASALT Strong Motion Recorder",
- Manufacturer: "Kinemetrics",
- Vendor: "",
- },
"BPR Subsystem": {
Name: "BPR Subsystem",
Type: "Bottom Pressure Recorder",
@@ -33,6 +26,13 @@ var DataloggerModels map[string]DataloggerModel = map[string]DataloggerModel{
Manufacturer: "SAIC",
Vendor: "",
},
+ "Basalt/8X": {
+ Name: "Basalt/8X",
+ Type: "Strong Motion Recorder",
+ Description: "Kinemetrics Basalt Strong Motion Recorder",
+ Manufacturer: "Kinemetrics",
+ Vendor: "",
+ },
"CUSP-Me": {
Name: "CUSP-Me",
Type: "Strong Motion Recorder",
@@ -145,8 +145,8 @@ var DataloggerModels map[string]DataloggerModel = map[string]DataloggerModel{
Manufacturer: "Nanometrics",
Vendor: "",
},
- "Obsidian 4X Datalogger": {
- Name: "Obsidian 4X Datalogger",
+ "Obsidian/4X": {
+ Name: "Obsidian/4X",
Type: "Strong Motion Recorder",
Description: "Kinemetrics Obsidian Strong Motion Recorder",
Manufacturer: "Kinemetrics",
@@ -1807,7 +1807,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
- DataloggerList: []string{"Obsidian 4X Datalogger"},
+ DataloggerList: []string{"Obsidian/4X"},
Type: "TG",
Label: "HN",
SampleRate: 200,
@@ -1921,7 +1921,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
- DataloggerList: []string{"Obsidian 4X Datalogger"},
+ DataloggerList: []string{"Obsidian/4X"},
Type: "CG",
Label: "BN",
SampleRate: 50,
@@ -2056,7 +2056,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
- DataloggerList: []string{"BASALT", "BASALT 8X DATALOGGER"},
+ DataloggerList: []string{"BASALT", "Basalt/8X"},
Type: "TG",
Label: "HN",
SampleRate: 200,
@@ -2170,7 +2170,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
- DataloggerList: []string{"BASALT", "BASALT 8X DATALOGGER"},
+ DataloggerList: []string{"BASALT", "Basalt/8X"},
Type: "CG",
Label: "BN",
SampleRate: 50,
diff --git a/resp/auto/datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_200sps.xml b/resp/auto/datalogger_Kinemetrics_Basalt8X_26bits_200sps.xml
similarity index 100%
rename from resp/auto/datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_200sps.xml
rename to resp/auto/datalogger_Kinemetrics_Basalt8X_26bits_200sps.xml
diff --git a/resp/auto/datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_50sps.xml b/resp/auto/datalogger_Kinemetrics_Basalt8X_26bits_50sps.xml
similarity index 100%
rename from resp/auto/datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_50sps.xml
rename to resp/auto/datalogger_Kinemetrics_Basalt8X_26bits_50sps.xml
diff --git a/resp/auto/datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_200sps.xml b/resp/auto/datalogger_Kinemetrics_Obsidian4X_24bits_200sps.xml
similarity index 100%
rename from resp/auto/datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_200sps.xml
rename to resp/auto/datalogger_Kinemetrics_Obsidian4X_24bits_200sps.xml
diff --git a/resp/auto/datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_50sps.xml b/resp/auto/datalogger_Kinemetrics_Obsidian4X_24bits_50sps.xml
similarity index 100%
rename from resp/auto/datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_50sps.xml
rename to resp/auto/datalogger_Kinemetrics_Obsidian4X_24bits_50sps.xml
diff --git a/resp/auto/datalogger_Kinemetrics_Obsidian_24bits_200sps.xml b/resp/auto/datalogger_Kinemetrics_Obsidian_24bits_200sps.xml
new file mode 100644
index 000000000..68c1c601d
--- /dev/null
+++ b/resp/auto/datalogger_Kinemetrics_Obsidian_24bits_200sps.xml
@@ -0,0 +1,301 @@
+
+
+
+ 420168
+ 50
+
+ V
+
+
+ count
+
+
+
+
+
+ V
+
+
+ count
+
+ DIGITAL
+
+
+ 30000
+ 1
+ 0
+ 0
+ 0
+
+
+ 420168
+ 50
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ 8.482486009597778e-06
+ 3.890367224812507e-05
+ 0.0001093456521630287
+ 0.0002269367687404156
+ 0.0003658398054540157
+ 0.0004479438066482544
+ 0.0003462270833551884
+ -7.080892100930214e-05
+ -0.0008515245281159877
+ -0.001858011353760958
+ -0.002705497201532125
+ -0.002812724094837904
+ -0.001603841781616211
+ 0.001166563015431166
+ 0.005081608425825835
+ 0.008903252426534891
+ 0.01075797248631716
+ 0.008733747527003288
+ 0.001773790456354618
+ -0.009436834603548048
+ -0.02199889672920108
+ -0.03108831727877259
+ -0.03111637616530061
+ -0.01752226473763585
+ 0.01136140851303935
+ 0.05307333404198289
+ 0.1009940803050995
+ 0.145714090205729
+ 0.1774811390787363
+ 0.188974788878113
+
+
+ 30000
+ 5
+ 0
+ 0.004833333333333334
+ 0.004833333333333334
+
+
+ 1
+ 50
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ 4.134653136134148e-05
+ 0.0002349885180592537
+ 0.0005912622436881066
+ 0.000653151422739029
+ -0.0004757065325975418
+ -0.002951483707875013
+ -0.004546653013676405
+ -0.001238157507032156
+ 0.008109699003398418
+ 0.01641841605305672
+ 0.01052534580230713
+ -0.01547469291836023
+ -0.04536575684323907
+ -0.04280856950208545
+ 0.02228518528863788
+ 0.1410595565102994
+ 0.2588349916040897
+ 0.3082139655016363
+
+
+ 6000
+ 3
+ 0
+ 0.0085
+ 0.0085
+
+
+ 1
+ 50
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ -1.257285475730896e-08
+ -1.052394509315491e-07
+ -4.852190613746643e-07
+ -1.627486199140549e-06
+ -4.362780600786209e-06
+ -9.754672646522522e-06
+ -1.852493733167648e-05
+ -2.983585000038147e-05
+ -3.954349085688591e-05
+ -3.85744497179985e-05
+ -1.276005059480667e-05
+ 5.418667569756508e-05
+ 0.000173286534845829
+ 0.0003388901241123676
+ 0.000516460742801428
+ 0.000635812059044838
+ 0.0005977586843073368
+ 0.0003004982136189938
+ -0.0003141919150948524
+ -0.001205069944262505
+ -0.002187044825404882
+ -0.002926119137555361
+ -0.002997958566993475
+ -0.002017401158809662
+ 0.0001824549399316311
+ 0.003374997526407242
+ 0.006844245828688145
+ 0.00944234011694789
+ 0.00984064722433686
+ 0.00695226900279522
+ 0.0004290700890123845
+ -0.008923533838242292
+ -0.01898761792108416
+ -0.02655896451324224
+ -0.02798473555594683
+ -0.0201029502786696
+ -0.001249298918992281
+ 0.02796922344714403
+ 0.06440833024680614
+ 0.1027804687619209
+ 0.1366737354546785
+ 0.1599652557633817
+ 0.1682611028663814
+
+
+ 2000
+ 5
+ 0
+ 0.105
+ 0.105
+
+
+ 1
+ 50
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ 2.887099981307983e-08
+ 2.05356627702713e-07
+ 6.207264959812165e-07
+ 7.185153663158417e-07
+ -1.384411007165909e-06
+ -7.797498255968094e-06
+ -1.698965206742287e-05
+ -2.110470086336136e-05
+ -1.161731779575348e-05
+ 7.803086191415787e-06
+ 1.77319161593914e-05
+ 2.987682819366456e-06
+ -2.143671736121178e-05
+ -1.971703022718429e-05
+ 1.552468165755272e-05
+ 3.819912672042847e-05
+ 4.4223852455616e-06
+ -5.01745380461216e-05
+ -3.896607086062431e-05
+ 4.4223852455616e-05
+ 8.129002526402473e-05
+ -1.015374436974525e-05
+ -0.0001164441928267479
+ -5.576759576797487e-05
+ 0.0001233899965882301
+ 0.0001456919126212597
+ -8.049886673688889e-05
+ -0.0002372981980443001
+ -2.621859312057495e-05
+ 0.0002950141206383705
+ 0.0001939283683896065
+ -0.0002767341211438179
+ -0.0003958549350500107
+ 0.0001456961035728455
+ 0.000579331535845995
+ 0.0001142676919698715
+ -0.0006719054654240609
+ -0.0004841401241719723
+ 0.0005963393487036229
+ 0.0009005633182823657
+ -0.0002930508926510811
+ -0.001256946008652449
+ -0.0002541979774832725
+ 0.001418221741914749
+ 0.0009961645118892193
+ -0.001249296590685844
+ -0.001807000022381544
+ 0.0006535770371556282
+ 0.002490855287760496
+ 0.0003859777934849262
+ -0.002809962257742882
+ -0.001773773226886988
+ 0.00253296596929431
+ 0.003287417814135551
+ -0.001496765296906233
+ -0.004591332282871008
+ -0.0003298721276223659
+ 0.005282256286591292
+ 0.002795955631881952
+ -0.004963790997862816
+ -0.00554609252139926
+ 0.003339842893183231
+ 0.008037911728024481
+ -0.0003104675561189651
+ -0.009603304788470268
+ -0.00394933857023716
+ 0.009548740461468695
+ 0.0089463428594172
+ -0.007280147168785334
+ -0.01387299923226237
+ 0.002430608961731195
+ 0.0176588729955256
+ 0.005034265574067831
+ -0.01905337581411004
+ -0.01475747022777796
+ 0.01669723214581609
+ 0.02599515160545707
+ -0.0090877590700984
+ -0.03768949117511511
+ -0.00581503426656127
+ 0.04860342387109995
+ 0.03231125790625811
+ -0.05749571742489934
+ -0.08599026687443256
+ 0.06330780219286682
+ 0.3113786461763084
+ 0.4346713689155877
+
+
+ 400
+ 2
+ 0
+ 0.43
+ 0.43
+
+
+ 1
+ 50
+
+
+
diff --git a/resp/auto/datalogger_Kinemetrics_Obsidian_24bits_50sps.xml b/resp/auto/datalogger_Kinemetrics_Obsidian_24bits_50sps.xml
new file mode 100644
index 000000000..0b09b399a
--- /dev/null
+++ b/resp/auto/datalogger_Kinemetrics_Obsidian_24bits_50sps.xml
@@ -0,0 +1,358 @@
+
+
+
+ 420168
+ 12.5
+
+ V
+
+
+ count
+
+
+
+
+
+ V
+
+
+ count
+
+ DIGITAL
+
+
+ 30000
+ 1
+ 0
+ 0
+ 0
+
+
+ 420168
+ 12.5
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ 8.482486009597778e-06
+ 3.890367224812507e-05
+ 0.0001093456521630287
+ 0.0002269367687404156
+ 0.0003658398054540157
+ 0.0004479438066482544
+ 0.0003462270833551884
+ -7.080892100930214e-05
+ -0.0008515245281159877
+ -0.001858011353760958
+ -0.002705497201532125
+ -0.002812724094837904
+ -0.001603841781616211
+ 0.001166563015431166
+ 0.005081608425825835
+ 0.008903252426534891
+ 0.01075797248631716
+ 0.008733747527003288
+ 0.001773790456354618
+ -0.009436834603548048
+ -0.02199889672920108
+ -0.03108831727877259
+ -0.03111637616530061
+ -0.01752226473763585
+ 0.01136140851303935
+ 0.05307333404198289
+ 0.1009940803050995
+ 0.145714090205729
+ 0.1774811390787363
+ 0.188974788878113
+
+
+ 30000
+ 5
+ 0
+ 0.004833333333333334
+ 0.004833333333333334
+
+
+ 1
+ 12.5
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ 4.134653136134148e-05
+ 0.0002349885180592537
+ 0.0005912622436881066
+ 0.000653151422739029
+ -0.0004757065325975418
+ -0.002951483707875013
+ -0.004546653013676405
+ -0.001238157507032156
+ 0.008109699003398418
+ 0.01641841605305672
+ 0.01052534580230713
+ -0.01547469291836023
+ -0.04536575684323907
+ -0.04280856950208545
+ 0.02228518528863788
+ 0.1410595565102994
+ 0.2588349916040897
+ 0.3082139655016363
+
+
+ 6000
+ 3
+ 0
+ 0.0085
+ 0.0085
+
+
+ 1
+ 12.5
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ -3.352761268615723e-08
+ -3.352761268615723e-07
+ -1.769512891769409e-06
+ -6.510876119136812e-06
+ -1.83936208486557e-05
+ -4.156818613409996e-05
+ -7.582595571875574e-05
+ -0.0001084986142814159
+ -0.0001069488935172558
+ -2.086581662297249e-05
+ 0.0001947963610291481
+ 0.0005333391018211842
+ 0.0008830726146697998
+ 0.00100777531042695
+ 0.0006102505140006543
+ -0.0004985881969332695
+ -0.002171097788959742
+ -0.00376407103613019
+ -0.004219412803649903
+ -0.00249074213206768
+ 0.001760566141456366
+ 0.007511888165026904
+ 0.0122265056706965
+ 0.01256878348067403
+ 0.005978860426694155
+ -0.007435898762196303
+ -0.02364646177738905
+ -0.03502486133947968
+ -0.03261676523834467
+ -0.009791054762899874
+ 0.03417997155338526
+ 0.0923473765142262
+ 0.1512907426804304
+ 0.1952138370834291
+ 0.2114638951607048
+
+
+ 2000
+ 4
+ 0
+ 0.068
+ 0.068
+
+
+ 1
+ 12.5
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ -1.257285475730896e-08
+ -1.052394509315491e-07
+ -4.852190613746643e-07
+ -1.627486199140549e-06
+ -4.362780600786209e-06
+ -9.754672646522522e-06
+ -1.852493733167648e-05
+ -2.983585000038147e-05
+ -3.954349085688591e-05
+ -3.85744497179985e-05
+ -1.276005059480667e-05
+ 5.418667569756508e-05
+ 0.000173286534845829
+ 0.0003388901241123676
+ 0.000516460742801428
+ 0.000635812059044838
+ 0.0005977586843073368
+ 0.0003004982136189938
+ -0.0003141919150948524
+ -0.001205069944262505
+ -0.002187044825404882
+ -0.002926119137555361
+ -0.002997958566993475
+ -0.002017401158809662
+ 0.0001824549399316311
+ 0.003374997526407242
+ 0.006844245828688145
+ 0.00944234011694789
+ 0.00984064722433686
+ 0.00695226900279522
+ 0.0004290700890123845
+ -0.008923533838242292
+ -0.01898761792108416
+ -0.02655896451324224
+ -0.02798473555594683
+ -0.0201029502786696
+ -0.001249298918992281
+ 0.02796922344714403
+ 0.06440833024680614
+ 0.1027804687619209
+ 0.1366737354546785
+ 0.1599652557633817
+ 0.1682611028663814
+
+
+ 500
+ 5
+ 0
+ 0.42
+ 0.42
+
+
+ 1
+ 12.5
+
+
+
+
+
+ count
+
+
+ count
+
+ ODD
+ 2.887099981307983e-08
+ 2.05356627702713e-07
+ 6.207264959812165e-07
+ 7.185153663158417e-07
+ -1.384411007165909e-06
+ -7.797498255968094e-06
+ -1.698965206742287e-05
+ -2.110470086336136e-05
+ -1.161731779575348e-05
+ 7.803086191415787e-06
+ 1.77319161593914e-05
+ 2.987682819366456e-06
+ -2.143671736121178e-05
+ -1.971703022718429e-05
+ 1.552468165755272e-05
+ 3.819912672042847e-05
+ 4.4223852455616e-06
+ -5.01745380461216e-05
+ -3.896607086062431e-05
+ 4.4223852455616e-05
+ 8.129002526402473e-05
+ -1.015374436974525e-05
+ -0.0001164441928267479
+ -5.576759576797487e-05
+ 0.0001233899965882301
+ 0.0001456919126212597
+ -8.049886673688889e-05
+ -0.0002372981980443001
+ -2.621859312057495e-05
+ 0.0002950141206383705
+ 0.0001939283683896065
+ -0.0002767341211438179
+ -0.0003958549350500107
+ 0.0001456961035728455
+ 0.000579331535845995
+ 0.0001142676919698715
+ -0.0006719054654240609
+ -0.0004841401241719723
+ 0.0005963393487036229
+ 0.0009005633182823657
+ -0.0002930508926510811
+ -0.001256946008652449
+ -0.0002541979774832725
+ 0.001418221741914749
+ 0.0009961645118892193
+ -0.001249296590685844
+ -0.001807000022381544
+ 0.0006535770371556282
+ 0.002490855287760496
+ 0.0003859777934849262
+ -0.002809962257742882
+ -0.001773773226886988
+ 0.00253296596929431
+ 0.003287417814135551
+ -0.001496765296906233
+ -0.004591332282871008
+ -0.0003298721276223659
+ 0.005282256286591292
+ 0.002795955631881952
+ -0.004963790997862816
+ -0.00554609252139926
+ 0.003339842893183231
+ 0.008037911728024481
+ -0.0003104675561189651
+ -0.009603304788470268
+ -0.00394933857023716
+ 0.009548740461468695
+ 0.0089463428594172
+ -0.007280147168785334
+ -0.01387299923226237
+ 0.002430608961731195
+ 0.0176588729955256
+ 0.005034265574067831
+ -0.01905337581411004
+ -0.01475747022777796
+ 0.01669723214581609
+ 0.02599515160545707
+ -0.0090877590700984
+ -0.03768949117511511
+ -0.00581503426656127
+ 0.04860342387109995
+ 0.03231125790625811
+ -0.05749571742489934
+ -0.08599026687443256
+ 0.06330780219286682
+ 0.3113786461763084
+ 0.4346713689155877
+
+
+ 100
+ 2
+ 0
+ 1.72
+ 1.72
+
+
+ 1
+ 12.5
+
+
+
diff --git a/resp/responses/configurations/strongmotion.yaml b/resp/responses/configurations/strongmotion.yaml
index 8cb34b5bd..19cf216a4 100644
--- a/resp/responses/configurations/strongmotion.yaml
+++ b/resp/responses/configurations/strongmotion.yaml
@@ -183,7 +183,7 @@ response:
- BASALT-50
reversed: false
- dataloggers:
- - Obsidian 4X Datalogger
+ - Obsidian/4X
type: TG
label: HN
samplerate: 200
@@ -194,7 +194,7 @@ response:
- OBSIDIAN-4X-200
reversed: false
- dataloggers:
- - Obsidian 4X Datalogger
+ - Obsidian/4X
type: CG
label: BN
samplerate: 50
@@ -206,7 +206,7 @@ response:
reversed: false
- dataloggers:
- BASALT
- - BASALT 8X DATALOGGER
+ - Basalt/8X
type: TG
label: HN
samplerate: 200
@@ -218,7 +218,7 @@ response:
reversed: false
- dataloggers:
- BASALT
- - BASALT 8X DATALOGGER
+ - Basalt/8X
type: CG
label: BN
samplerate: 50
diff --git a/resp/responses/dataloggers/kinemetrics.yaml b/resp/responses/dataloggers/kinemetrics.yaml
index 5fe6effe2..f5fcb263e 100644
--- a/resp/responses/dataloggers/kinemetrics.yaml
+++ b/resp/responses/dataloggers/kinemetrics.yaml
@@ -5,7 +5,7 @@ datalogger-model:
description: Basalt
manufacturer: Kinemetrics
vendor: ""
- BASALT 8X DATALOGGER:
+ Basalt/8X:
type: Strong Motion Recorder
description: Basalt
manufacturer: Kinemetrics
@@ -20,7 +20,7 @@ datalogger-model:
description: Etna 2
manufacturer: Kinemetrics
vendor: ""
- Obsidian 4X Datalogger:
+ Obsidian/4X:
type: Strong Motion Recorder
description: Obsidian
manufacturer: Kinemetrics
diff --git a/tools/altus/build.go b/tools/altus/build.go
index 39197e40f..010ecb724 100644
--- a/tools/altus/build.go
+++ b/tools/altus/build.go
@@ -111,7 +111,7 @@ func buildSites(base string) ([]Site, error) {
switch installation.Sensor.Model {
case "FBA-ES-T-OBSIDIAN", "FBA-ES-T-BASALT", "FBA-ES-T-DECK", "FBA-23-DECK", "FBA-ES-T", "FBA-ES-T-ISO", "SBEPI", "SDP":
switch installation.Datalogger.Model {
- case "OBSIDIAN", "K2", "ETNA", "BASALT", "BASALT 8X DATALOGGER":
+ case "OBSIDIAN", "K2", "ETNA", "BASALT", "Basalt/8X":
for _, response := range resp.Streams(installation.Datalogger.Model, installation.Sensor.Model) {
stream, err := db.StationLocationSamplingRateStartStream(
station.Code,
@@ -157,7 +157,7 @@ func buildSites(base string) ([]Site, error) {
return "ETN"
case "BASALT":
return "BAS"
- case "BASALT 8X DATALOGGER":
+ case "Basalt/8X":
return "BAS"
case "OBSIDIAN":
return "OBS"
@@ -167,7 +167,7 @@ func buildSites(base string) ([]Site, error) {
}(),
InstId: func() string {
switch installation.Datalogger.Model {
- case "BASALT 8X DATALOGGER":
+ case "Basalt/8X":
return installation.Datalogger.Serial
default:
return installation.Sensor.Serial
@@ -249,7 +249,7 @@ func buildSites(base string) ([]Site, error) {
PinNo: pin,
ChanNo: func() string {
switch installation.Datalogger.Model {
- case "BASALT 8X DATALOGGER":
+ case "Basalt/8X":
if chan_no > 2 {
return strconv.Itoa(chan_no)
}
diff --git a/tools/altus/testdata/install/dataloggers.csv b/tools/altus/testdata/install/dataloggers.csv
index 960f63bc5..d9f3fc2ed 100644
--- a/tools/altus/testdata/install/dataloggers.csv
+++ b/tools/altus/testdata/install/dataloggers.csv
@@ -1,5 +1,5 @@
Make,Model,Serial,Place,Role,Start Date,End Date
-Kinemetrics,Obsidian 4X Datalogger,139,Deep Cove,Strong Motion,2015-10-22T05:00:01Z,9999-01-01T00:00:00Z
+Kinemetrics,Obsidian/4X,139,Deep Cove,Strong Motion,2015-10-22T05:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/6,647,Deep Cove,,2005-07-23T00:00:00Z,2015-10-22T00:00:00Z
Kinemetrics,Q330/6,3141,Denniston North,,2009-05-13T03:30:01Z,2016-11-09T08:00:00Z
Kinemetrics,Q330S/6,6049,Denniston North,,2016-11-09T08:00:01Z,9999-01-01T00:00:00Z
diff --git a/tools/impact/blessed.go b/tools/impact/blessed.go
index f89d04169..ea6d205c8 100644
--- a/tools/impact/blessed.go
+++ b/tools/impact/blessed.go
@@ -37,7 +37,7 @@ var blessedDataloggerList = []string{
"ETNA 2",
"CUSP3D",
"CUSP3C",
- "Obsidian 4X Datalogger",
+ "Obsidian/4X",
"TitanSMA",
"EQR120",
}