Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Appdata for viking 1 and 2 #3743

Merged
merged 17 commits into from
Mar 13, 2020
+137 −6
Merged

Appdata for viking 1 and 2 #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7415a70
Changeing env variable ISIS3DATA to ISISDATA
scsides Mar 3, 2020
d846ad3
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
scsides Mar 3, 2020
3f0d9ee
Changed ISIS3DATA to ISISDATA and pointed to new data area
scsides Mar 3, 2020
a23bec4
Updating PR with new location of ISISDATA
scsides Mar 3, 2020
c7e2d9c
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
scsides Mar 5, 2020
79da29c
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
scsides Mar 5, 2020
651fcfd
Converted LRO mission to new data area
scsides Mar 5, 2020
0073f99
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
scsides Mar 5, 2020
b67e53f
Added MiniRF format files
scsides Mar 6, 2020
53ef908
Add pft files
scsides Mar 6, 2020
5326567
Update typ paths, and add LRO serial number files
scsides Mar 6, 2020
323b401
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
scsides Mar 9, 2020
375ce85
Move Viking 1 data files into git source repo
scsides Mar 9, 2020
bab04af
Additions to initial commit of Viking 1 and 2, move data to repo
scsides Mar 9, 2020
14a2668
Updated serial number file names
scsides Mar 13, 2020
dd95886
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
scsides Mar 13, 2020
4ceb084
Removed uneeded translations and fixed now that there is one file per…
scsides Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions isis/appdata/serialnumbers/Viking1CameraASerialNumber.trn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = (Group, SerialNumberKeywords)
Translation = (Viking1, VIKING_ORBITER_1)
Translation = (*, *)
End_Group

Group = Keyword2
Auto
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword2
OutputPosition = (Group, SerialNumberKeywords)
Translation = (VISA, VISUAL_IMAGING_SUBSYSTEM_CAMERA_A)
Translation = (*, *)
End_Group

Group = Keyword3
Auto
InputKey = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword3
OutputPosition = (Group, SerialNumberKeywords)
Translation = (*, *)
End_Group
End
32 changes: 32 additions & 0 deletions isis/appdata/serialnumbers/Viking1CameraBSerialNumber.trn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = (Group, SerialNumberKeywords)
Translation = (Viking1, VIKING_ORBITER_1)
Translation = (*, *)
End_Group

Group = Keyword2
Auto
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword2
OutputPosition = (Group, SerialNumberKeywords)
Translation = (VISB, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B)
Translation = (*, *)
End_Group

Group = Keyword3
Auto
InputKey = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword3
OutputPosition = (Group, SerialNumberKeywords)
Translation = (*, *)
End_Group
End
32 changes: 32 additions & 0 deletions isis/appdata/serialnumbers/Viking2CameraASerialNumber.trn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = (Group, SerialNumberKeywords)
Translation = (Viking2, VIKING_ORBITER_2)
Translation = (*, *)
End_Group

Group = Keyword2
Auto
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword2
OutputPosition = (Group, SerialNumberKeywords)
Translation = (VISA, VISUAL_IMAGING_SUBSYSTEM_CAMERA_A)
Translation = (*, *)
End_Group

Group = Keyword3
Auto
InputKey = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword3
OutputPosition = (Group, SerialNumberKeywords)
Translation = (*, *)
End_Group
End
32 changes: 32 additions & 0 deletions isis/appdata/serialnumbers/Viking2CameraBSerialNumber.trn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = (Group, SerialNumberKeywords)
Translation = (Viking2, VIKING_ORBITER_2)
Translation = (*, *)
End_Group

Group = Keyword2
Auto
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword2
OutputPosition = (Group, SerialNumberKeywords)
Translation = (VISB, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B)
Translation = (*, *)
scsides marked this conversation as resolved.
Show resolved Hide resolved
End_Group

Group = Keyword3
Auto
InputKey = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword3
OutputPosition = (Group, SerialNumberKeywords)
Translation = (*, *)
End_Group
End
5 changes: 2 additions & 3 deletions isis/appdata/translations/Instruments.trn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,12 @@ Group = InstrumentName
Translation = (Tgo, CaSSIS)

# Viking
Translation = (Vik, VISUAL_IMAGING_SUBSYSTEM_CAMERA_A)
Translation = (Vik, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B)
Translation = (CameraA, VISUAL_IMAGING_SUBSYSTEM_CAMERA_A)
Translation = (CameraB, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B)

# Voyager
Translation = (Voyager, WIDE_ANGLE_CAMERA)
Translation = (Voyager, NARROW_ANGLE_CAMERA)

# Translation = (*,*)
End_Group
End
10 changes: 7 additions & 3 deletions isis/src/viking/apps/viknobutter/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@ void IsisMain() {
pipeline.Application("mask").SetInputParameter("FROM", false);
pipeline.Application("mask").SetOutputParameter("TO", "step3");

QString maskParameter = "$ISIS3DATA/viking" + toString(spn) +
QString maskParameter = "$ISISDATA/viking" + toString(spn) +
"/calibration/vik" + toString(spn);
if(even) maskParameter += "evenMask.cub";
else maskParameter += "oddMask.cub";
if(even) {
maskParameter += "evenMask.cub";
}
else {
maskParameter += "oddMask.cub";
}
pipeline.Application("mask").AddConstParameter("mask", maskParameter);

// Run a low pass filter on the invalid data in the cube
Expand Down