Skip to content

Commit

Permalink
update model name Kinemetrics Basalt 8X
Browse files Browse the repository at this point in the history
  • Loading branch information
@elidana
elidana committed Jun 7, 2023
1 parent cfc8d07 commit a27af96
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions assets/dataloggers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ 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,
Expand Down
4 changes: 2 additions & 2 deletions install/channels.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ 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
Expand Down
12 changes: 6 additions & 6 deletions install/dataloggers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,12 @@ 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,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 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
Expand Down
2 changes: 1 addition & 1 deletion meta/testdata/models.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Make,Model,Type
General Electric,Druck PTX-1830,Pressure Sensor
Kinemetrics,BASALT 8X DATALOGGER,Datalogger
Kinemetrics,Basalt/8X,Datalogger
18 changes: 9 additions & 9 deletions resp/auto.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ 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",
Description: "SAIC BPR Bottom Pressure Recorder",
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",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
0 ...rics_BASALT8XDATALOGGER_26bits_200sps.xml → ...er_Kinemetrics_Basalt8X_26bits_200sps.xml
View file
File renamed without changes.
0 ...trics_BASALT8XDATALOGGER_26bits_50sps.xml → ...ger_Kinemetrics_Basalt8X_26bits_50sps.xml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions resp/responses/configurations/strongmotion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ response:
reversed: false
- dataloggers:
- BASALT
- BASALT 8X DATALOGGER
- Basalt/8X
type: TG
label: HN
samplerate: 200
Expand All @@ -218,7 +218,7 @@ response:
reversed: false
- dataloggers:
- BASALT
- BASALT 8X DATALOGGER
- Basalt/8X
type: CG
label: BN
samplerate: 50
Expand Down
2 changes: 1 addition & 1 deletion resp/responses/dataloggers/kinemetrics.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ datalogger-model:
description: Basalt
manufacturer: Kinemetrics
vendor: ""
BASALT 8X DATALOGGER:
Basalt/8X:
type: Strong Motion Recorder
description: Basalt
manufacturer: Kinemetrics
Expand Down
8 changes: 4 additions & 4 deletions tools/altus/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down

0 comments on commit a27af96

Please sign in to comment.