solve merge conflict with develop

data/scene/67P/67P.mod

@@ -130,4 +130,4 @@ return {
         },
         GuiName = "/Solar/67PTrail"
     }
-}
+}

data/scene/default_nh.scene

@@ -1,3 +1,5 @@
+UseAccurateNewHorizonsKernels = false
+
 return {
     ScenePath = ".",
     CommonFolder = "common",
@@ -14,41 +16,15 @@ return {
         "saturn",
         "uranus",
         "neptune",
-        --"PlutoProjection",
-        "plutoprojectionhybrid",
-        "charonprojection",
-        "kerberos",
-        "nix",
-        "styx",
-        "hydra",
+        "newhorizons/pluto",
+        "newhorizons/jupiter",
         "stars",
         -- "stars-denver",
         "milkyway",
         -- "milkyway-eso",
         "imageplane",
-        --"constellationbounds",
-        --"io",     
-        --"europa",
-        --"ganymede",
-        --"callisto",
-        "jupiterprojection",
-        "ioprojection",
-        "europaprojection",
-        "ganymedeprojection",
-        "callistoprojection",
-        "newhorizons",
-        "newhorizonsfov",
-        --"gridGalactic",
-        --"gridEcliptic",
-        --"gridEquatorial",
-        -- "ephemeris",
-
-    -- "newhorizonspath",
-    --   "newhorizonstrail",
-        -- "enlil",
-        -- "volumegl3",
-        -- "volumegl2",
-        -- "volumegl",
+        "newhorizons/newhorizons",
+        "newhorizons/newhorizonsfov",
     }
 }
 

data/scene/enlilnh/enlilnh.mod

@@ -0,0 +1,22 @@
+return {
+    -- Volume module
+    {   
+        Name = "Enlil New Horizons",
+        Parent = "Root",
+        Ephemeris = {
+            Type = "Static",
+            Position = { 0.0, 0.0, 0.0, 0}
+        },
+        Renderable = {
+            Type = "RenderableMultiresVolume",
+            Translation = {0, 0, 0},
+            Rotation = {2.1, 0, 0},
+            Scaling = {1.1, 1.1, 1.1},
+            ScalingExponent = 12,
+			Source = "tsp/enlil_nh_128_128_16.tsp",
+            TransferFunction = "transferfunctions/fire.txt",
+			BrickSelector = "tf",
+        },
+        GuiName = "/Volumes/ENLIL New Horizons"
+    }
+}

data/scene/enlilnh/transferfunctions/fire.txt

@@ -0,0 +1,10 @@
+width 1024
+lower 0.0
+upper 1.0
+
+mappingkey	0.05	254	0	0	0
+mappingkey	0.10	254	0	0	110
+mappingkey	0.12	254	220	0	254
+mappingkey	0.15	254	100	0	254 
+mappingkey	0.20	180	0	0	254
+mappingkey	0.25	180	0	80	254

data/scene/mars/mars.data

@@ -3,6 +3,6 @@ return {
         { Identifier = "mars_textures", Destination = "textures", Version = 1 }
     },
     TorrentFiles = {
-        { File = "MAR063.BSP.torrent", Destination = "${SPICE}" }
+        -- { File = "MAR063.BSP.torrent", Destination = "${SPICE}" }
     }
 }

data/scene/mars/mars.mod

@@ -37,7 +37,7 @@ return {
             Reference = "ECLIPJ2000",
             Observer = "SUN",
             Kernels = {
-                "${OPENSPACE_DATA}/spice/MAR063.BSP"
+                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
             }
         },
         Rotation = {

data/scene/newhorizons/jupiter/jupiterprojection/jupiterprojection.mod

@@ -39,7 +39,7 @@ return {
             },
 			Projection = {
 				--Sequence   = "F:/JupiterFullSequence",
-				Sequence   = "${OPENSPACE_DATA}/scene/jupiterprojection/ProjectionsOfInterest",
+				Sequence   = "${OPENSPACE_DATA}/scene/newhorizons/jupiter/jupiterprojection/ProjectionsOfInterest",
                 SequenceType = "image-sequence",
 				Observer   = "NEW HORIZONS",
 				Target     = "JUPITER",

data/scene/newhorizons/newhorizons/newhorizons.mod

@@ -1,3 +1,82 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        -- SCLK
+        "${SPICE}/nh_kernels/sclk/new-horizons_0976.tsc",
+        -- "${SPICE}/NewHorizonsKernels/new_horizons_413.tsc",
+
+        -- SPK
+        "${SPICE}/nh_kernels/spk/nh_pred_20141201_20190301_od122.bsp",
+        -- "${SPICE}/nh_kernels/spk/nh_pred_20120501_20160913_od093.bsp",
+        "${SPICE}/nh_kernels/spk/plu_all_mvi.spk",
+        "${SPICE}/jup260.bsp",
+        -- "${SPICE}/NewHorizonsKernels/de413.bsp",
+
+        -- CK
+        "${SPICE}/nh_kernels/ck/nh_scispi_2015_pred.bc",
+        "${SPICE}/nh_kernels/ck/nh_scispi_2015_recon.bc",
+        "${SPICE}/nh_kernels/ck/nh_lorri_wcs.bc",
+        "${SPICE}/nh_kernels/ck/plutonet_PS104.bc",
+
+        -- FK
+        "${SPICE}/nh_kernels/fk/nh_soc_misc_v001.tf",
+        "${SPICE}/nh_kernels/fk/nh_v220.tf",
+
+        -- IK
+        "${SPICE}/nh_kernels/ik/nh_alice_v120.ti",
+        "${SPICE}/nh_kernels/ik/nh_allinstruments_v002.ti",
+        "${SPICE}/nh_kernels/ik/nh_astr_v000.ti",
+        "${SPICE}/nh_kernels/ik/nh_fss_v000.ti",
+        "${SPICE}/nh_kernels/ik/nh_lorri_v100.ti",
+        "${SPICE}/nh_kernels/ik/nh_pepssi_v110.ti",
+        "${SPICE}/nh_kernels/ik/nh_ralph_v100.ti",
+        "${SPICE}/nh_kernels/ik/nh_rex_v100.ti",
+        "${SPICE}/nh_kernels/ik/nh_sdc_v101.ti",
+        "${SPICE}/nh_kernels/ik/nh_swap_v100.ti",
+
+        -- LSK
+        "${SPICE}/nh_kernels/lsk/naif0011.tls",
+
+        -- PCK
+        "${SPICE}/nh_kernels/pck/nh_targets_v001.tpc",
+        "${SPICE}/nh_kernels/pck/pck00010.tpc",
+        "${SPICE}/nh_kernels/pck/nh_pcnh_002.tpc"
+    };
+else
+    NewHorizonsKernels = {
+        --SCLK
+
+        "${SPICE}/NewHorizonsKernels/new_horizons_413.tsc",
+
+        "${SPICE}/NewHorizonsKernels/nhops_CORE_v9g_cdh2.bc",
+        "${SPICE}/NewHorizonsKernels/nh_ref_20080710_20160101_od059B.bsp",
+
+        "${SPICE}/de430_1850-2150.bsp",
+        -- CK
+        "${SPICE}/NewHorizonsKernels/merged_nhpc_2006_v011.bc",
+        "${SPICE}/NewHorizonsKernels/merged_nhpc_2007_v006.bc",
+        -- FK       
+        "${SPICE}/NewHorizonsKernels/nh_v200.tf",
+        -- IK       
+        "${SPICE}/NewHorizonsKernels/nh_alice_v110.ti",
+        "${SPICE}/NewHorizonsKernels/nh_lorri_v100.ti",
+        "${SPICE}/NewHorizonsKernels/nh_pepssi_v110.ti",
+        "${SPICE}/NewHorizonsKernels/nh_ralph_v100.ti",
+        "${SPICE}/NewHorizonsKernels/nh_rex_v100.ti",
+        "${SPICE}/NewHorizonsKernels/nh_sdc_v101.ti",
+        "${SPICE}/NewHorizonsKernels/nh_swap_v100.ti",
+        -- PCK      
+
+        -- SPK      
+        "${SPICE}/jup260.bsp",
+        "${SPICE}/NewHorizonsKernels/de413.bsp",
+        "${SPICE}/NewHorizonsKernels/nh_nep_ura_000.bsp",
+        "${SPICE}/NewHorizonsKernels/nh_recon_e2j_v1.bsp",
+        "${SPICE}/NewHorizonsKernels/nh_recon_j2sep07_prelimv1.bsp",
+        "${SPICE}/NewHorizonsKernels/sb_2002jf56_2.bsp",
+        "${SPICE}/NewHorizonsKernels/nh_plu017.bsp",
+    }
+end
+
 return {
     -- New Horizons Body module
     {   
@@ -10,7 +89,7 @@ return {
             Body = "NEW HORIZONS",
             Geometry = {
                 Type = "MultiModelGeometry",
-                GeometryFile = "${OPENSPACE_DATA}/scene/newhorizons/models/NewHorizonsCleanModel.obj",
+                GeometryFile = "models/NewHorizonsCleanModel.obj",
                 Magnification = 4,
             }, 
             Textures = {
@@ -35,39 +114,7 @@ return {
                 -- Observer = "PLUTO BARYCENTER",
                 Observer = "SUN",
                 -- Observer = "JUPITER BARYCENTER",
-                Kernels = {
-                    --SCLK
-                    
-                    "${SPICE}/NewHorizonsKernels/new_horizons_413.tsc",
-                    
-                    "${SPICE}/NewHorizonsKernels/nhops_CORE_v9g_cdh2.bc",
-                    "${SPICE}/NewHorizonsKernels/nh_ref_20080710_20160101_od059B.bsp",
-                    
-                    "${SPICE}/de430_1850-2150.bsp",
-                    -- CK
-                    "${SPICE}/NewHorizonsKernels/merged_nhpc_2006_v011.bc",
-                    "${SPICE}/NewHorizonsKernels/merged_nhpc_2007_v006.bc",
-                    -- FK       
-                    "${SPICE}/NewHorizonsKernels/nh_v200.tf",
-                    -- IK       
-                    "${SPICE}/NewHorizonsKernels/nh_alice_v110.ti",
-                    "${SPICE}/NewHorizonsKernels/nh_lorri_v100.ti",
-                    "${SPICE}/NewHorizonsKernels/nh_pepssi_v110.ti",
-                    "${SPICE}/NewHorizonsKernels/nh_ralph_v100.ti",
-                    "${SPICE}/NewHorizonsKernels/nh_rex_v100.ti",
-                    "${SPICE}/NewHorizonsKernels/nh_sdc_v101.ti",
-                    "${SPICE}/NewHorizonsKernels/nh_swap_v100.ti",
-                    -- PCK      
-                    
-                    -- SPK      
-                    "${SPICE}/jup260.bsp",
-                    "${SPICE}/NewHorizonsKernels/de413.bsp",
-                    "${SPICE}/NewHorizonsKernels/nh_nep_ura_000.bsp",
-                    "${SPICE}/NewHorizonsKernels/nh_recon_e2j_v1.bsp",
-                    "${SPICE}/NewHorizonsKernels/nh_recon_j2sep07_prelimv1.bsp",
-                    "${SPICE}/NewHorizonsKernels/sb_2002jf56_2.bsp",
-                    "${SPICE}/NewHorizonsKernels/nh_plu017.bsp",
-                }
+                Kernels = NewHorizonsKernels
             },
         GuiName = "/Solar/NewHorizons"
     },
@@ -104,7 +151,7 @@ return {
             Body = "NEW HORIZONS",
             Geometry = {
                 Type = "MultiModelGeometry",
-                GeometryFile = "${OPENSPACE_DATA}/scene/newhorizons/models/Labels.obj",
+                GeometryFile = "models/Labels.obj",
                 Magnification = 4,
             }, 
             Textures = {

data/scene/newhorizons/pluto/charonprojection/charonprojection.mod

@@ -1,3 +1,14 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+    }
+else
+    NewHorizonsKernels = {
+        "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+    }
+end
+
+
 return {
     -- CharonProjection module
     {   
@@ -47,9 +58,7 @@ return {
             Body = "CHARON",
             Reference = "ECLIPJ2000",
             Observer = "PLUTO BARYCENTER",
-            Kernels = {
-                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
         Rotation = {
             Type = "Spice",

data/scene/newhorizons/pluto/hydra/hydra.mod

@@ -1,3 +1,13 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+    }
+else
+    NewHorizonsKernels = {
+        "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
+    }
+end
+
 return {
     -- Hydra module
     {   
@@ -27,9 +37,7 @@ return {
             Body = "Hydra",
             Reference = "ECLIPJ2000",
             Observer = "PLUTO BARYCENTER",
-            Kernels = {
-                "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
         Rotation = {
             Type = "Spice",

data/scene/newhorizons/pluto/kerberos/kerberos.mod

@@ -1,3 +1,13 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+    }
+else
+    NewHorizonsKernels = {
+        "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
+    }
+end
+
 return {
     -- Styx module
     {   
@@ -27,9 +37,7 @@ return {
             Body = "KERBEROS",
             Reference = "ECLIPJ2000",
             Observer = "PLUTO BARYCENTER",
-            Kernels = {
-               "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
         Rotation = {
             Type = "Spice",

data/scene/newhorizons/pluto/nix/nix.mod

@@ -1,3 +1,13 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+    }
+else
+    NewHorizonsKernels = {
+        "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
+    }
+end
+
 return {
     -- Nix module
     {   
@@ -27,9 +37,7 @@ return {
             Body = "NIX",
             Reference = "ECLIPJ2000",
             Observer = "PLUTO BARYCENTER",
-            Kernels = {
-                "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
         Rotation = {
             Type = "Spice",

data/scene/newhorizons/pluto/plutoprojection/plutoprojection.data

@@ -2,6 +2,7 @@ return {
     FileRequest = {
         { Identifier = "newhorizons_plutoencounter_pluto_assets", Destination = "assets", Version = 1 },
         { Identifier = "newhorizons_plutoencounter_pluto_textures", Destination = "textures", Version = 2 },
-        { Identifier = "pluto_textures", Destination = "textures", Version = 2 }
+        { Identifier = "pluto_textures", Destination = "textures", Version = 2 },
+        { Identifier = "newhorizons_plutoencounter_pluto_images", Destination = "images", Version = 1 }
     },
 }

data/scene/newhorizons/pluto/plutoprojection/plutoprojection.mod

@@ -1,3 +1,14 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        "${SPICE}/nh_kernels/spk/NavPE_de433_od122.bsp",
+        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+    }
+else
+    NewHorizonsKernels = {
+        "${SPICE}/NewHorizonsKernels/nh_plu017.bsp"
+    }
+end
+
 return {
     -- Pluto barycenter module
     {
@@ -8,9 +19,7 @@ return {
             Body = "PLUTO BARYCENTER",
             Reference = "ECLIPJ2000",
             Observer = "SUN",
-            Kernels = {
-                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
     },
     -- PlutoProjection module
@@ -28,7 +37,10 @@ return {
             },
             Textures = {
                 Type = "simple",
-                Color = "textures/pluto_large.jpg",
+                -- Color = "textures/pluto_highres_180.jpg",
+                Color = "textures/Shenk_180.jpg",
+                -- Color = "textures/pluto_large.jpg",
+                -- Color = "textures/white.png",
 				Project = "textures/3.jpg",
 				Sequencing = "true",
             },
@@ -38,44 +50,14 @@ return {
                 MieColor = {1.0, 1.0, 1.0}
             },
 			Projection = {
-				--Sequence    = "${OPENSPACE_DATA}/scene/plutoprojection/assets/incomingImagery",
-				--SequenceType = "image-sequence",
-				Sequence = "${OPENSPACE_DATA}/scene/plutoprojection/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
-                SequenceType = "playbook",
-				Observer   = "NEW HORIZONS",
-				Target     = "PLUTO",
-				Aberration = "NONE",
+				Sequence       = "${OPENSPACE_DATA}/scene/newhorizons/pluto/plutoprojection/images",
+				EventFile      = "${OPENSPACE_DATA}/scene/newhorizons/pluto/plutoprojection/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
+                SequenceType   = "hybrid",
+				Observer       = "NEW HORIZONS",
+				Target         = "PLUTO",
+				Aberration     = "NONE",
 			},
 		    DataInputTranslation = {
-				--[[Instrument = {
-					LORRI = {
-						DetectorType  = "Camera",
-						Spice = {"NH_LORRI"},
-					},
-					RALPH_MVIC_PAN_FRAME = {
-						DetectorType  = "Scanner",
-						StopCommand = "RALPH_ABORT",
-						Spice = {"NH_RALPH_MVIC_FT"},
-					},					
-				},					
-				Target ={ 
-					Read  = {
-						"TARGET_NAME",
-						"INSTRUMENT_HOST_NAME",
-						"INSTRUMENT_ID", 
-						"START_TIME", 
-						"STOP_TIME", 
-						"DETECTOR_TYPE",
-						--"SEQUENCE_ID",
-					},
-					Convert = { 
-						PLUTO       = {"PLUTO"       },
-						NEWHORIZONS = {"NEW HORIZONS"},
-						CCD         = {"CAMERA"      },
-						FRAMECCD    = {"SCANNER"     },
-					},
-				},
-				--]]
 				Instrument = {
 					LORRI = {
 						DetectorType  = "Camera",
@@ -134,6 +116,23 @@ return {
                         StopCommand = "REX_MODE_OFF",
                         Spice = { "NH_REX" },
                     }
+				},				
+				Target ={ 
+					Read  = {
+						"TARGET_NAME",
+						"INSTRUMENT_HOST_NAME",
+						"INSTRUMENT_ID", 
+						"START_TIME", 
+						"STOP_TIME", 
+						"DETECTOR_TYPE",
+						--"SEQUENCE_ID",
+					},
+					Convert = { 
+						PLUTO       = {"PLUTO"       },
+						NEWHORIZONS = {"NEW HORIZONS"},
+						CCD         = {"CAMERA"      },
+						FRAMECCD    = {"SCANNER"     },
+					},
 				},
 			},
 			Instrument = {                
@@ -159,9 +158,7 @@ return {
             Body = "PLUTO",
             Reference = "GALACTIC",
             Observer = "PLUTO BARYCENTER",
-            Kernels = {
-                  "${SPICE}/NewHorizonsKernels/nh_plu017.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
         Rotation = {
             Type = "Spice",
@@ -171,7 +168,7 @@ return {
         GuiName = "/Solar/Planets/Pluto"
     },
 	{   
-       Name = "Barycenter",
+       Name = "PlutoBarycenterLabel",
        Parent = "PlutoBarycenter",
        Renderable = {
            Type = "RenderablePlane",
@@ -185,14 +182,8 @@ return {
            }
        },
         Ephemeris = {
-            Type = "Spice",
-            Body = "PLUTO BARYCENTER",
-            Reference = "ECLIPJ2000",
-            Observer = "SUN",
-            Kernels = {
-                --"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-                "${OPENSPACE_DATA}/spice/nh_plu017.bsp"
-            }
+            Type = "Static",
+            Position = {0, 0, 0, 1}
         },
     },
     {
@@ -264,25 +255,6 @@ return {
             },  
         },
         GuiName = "/Solar/CharonTrail"
-    },
-	{   
-       Name = "PlutoBarycenterLabel",
-       Parent = "PlutoBarycenter",
-       Renderable = {
-           Type = "RenderablePlane",
-           Billboard = true,
-           Size = { 5, 4 },
-           Texture = "textures/barycenter.png",
-           Atmosphere = {
-               Type = "Nishita", -- for example, values missing etc etc
-               MieFactor = 1.0,
-               MieColor = {1.0, 1.0, 1.0}
-           }
-       },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, 0, 0, 1}
-        },
     },
   -- PlutoTrail module
     {   

data/scene/newhorizons/pluto/styx/styx.mod

@@ -1,3 +1,13 @@
+if UseAccurateNewHorizonsKernels then
+    NewHorizonsKernels = {
+        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+    }
+else
+    NewHorizonsKernels = {
+        "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
+    }
+end
+
 return {
     -- Styx module
     {   
@@ -27,9 +37,7 @@ return {
             Body = "STYX",
             Reference = "ECLIPJ2000",
             Observer = "PLUTO BARYCENTER",
-            Kernels = {
-               "${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
-            }
+            Kernels = NewHorizonsKernels
         },
         Rotation = {
             Type = "Spice",

data/scene/plutoprojectionhybrid/plutoprojectionhybrid.data

@@ -1,7 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "newhorizons_plutoencounter_pluto_assets", Destination = "assets", Version = 1 },
-        { Identifier = "newhorizons_plutoencounter_pluto_textures", Destination = "textures", Version = 2 },
-        { Identifier = "pluto_textures", Destination = "textures", Version = 2 }
-    },
-}

data/scene/plutoprojectionhybrid/plutoprojectionhybrid.mod

@@ -1,273 +0,0 @@
-return {
-    -- Pluto barycenter module
-    {
-        Name = "PlutoBarycenter",
-        Parent = "SolarSystemBarycenter",
-        Ephemeris = {
-            Type = "Spice",
-            Body = "PLUTO BARYCENTER",
-            Reference = "ECLIPJ2000",
-            Observer = "SUN",
-            Kernels = {
-                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            }
-        },
-    },
-    -- PlutoProjection module
-    {   
-        Name = "PlutoProjection",
-        Parent = "PlutoBarycenter",
-        Renderable = {
-            Type = "RenderablePlanetProjection",
-			Frame = "IAU_PLUTO",
-			Body = "PLUTO",
-            Geometry = {
-                Type = "SimpleSphereProjection",
-                Radius = { 1.173 , 6 },
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                -- Color = "textures/pluto_highres_180.jpg",
-                Color = "textures/Shenk_180.jpg",
-                -- Color = "textures/pluto_large.jpg",
-                -- Color = "textures/white.png",
-				Project = "textures/3.jpg",
-				Sequencing = "true",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            },
-			Projection = {
-				Sequence       = "${OPENSPACE_DATA}/scene/plutoprojectionhybrid/images",
-				EventFile      = "${OPENSPACE_DATA}/scene/plutoprojectionhybrid/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
-                SequenceType   = "hybrid",
-				Observer       = "NEW HORIZONS",
-				Target         = "PLUTO",
-				Aberration     = "NONE",
-			},
-		    DataInputTranslation = {
-				Instrument = {
-					LORRI = {
-						DetectorType  = "Camera",
-						Spice = {"NH_LORRI"},
-					},
-					RALPH_MVIC_PAN_FRAME = {
-						DetectorType  = "Scanner",
-						StopCommand = "RALPH_ABORT",
-						Spice = {"NH_RALPH_MVIC_FT"},
-					},
-					RALPH_MVIC_COLOR = {
-						DetectorType = "Scanner",
-						StopCommand = "END_NOM",
-						Spice = { "NH_RALPH_MVIC_NIR", 
-								  "NH_RALPH_MVIC_METHANE", 
-								  "NH_RALPH_MVIC_RED", 
-								  "NH_RALPH_MVIC_BLUE" },
-					},
-					RALPH_LEISA = {
-						DetectorType = "Scanner",
-						StopCommand = "END_NOM",
-						Spice = {"NH_RALPH_LEISA"},
-					},	
-					RALPH_MVIC_PAN1 = {
-						DetectorType = "Scanner",
-						StopCommand = "END_NOM",
-						Spice = {"NH_RALPH_MVIC_PAN1"},
-					},
-					RALPH_MVIC_PAN2 = {
-						DetectorType = "Scanner",
-						StopCommand = "END_NOM",
-						Spice = {"NH_RALPH_MVIC_PAN2"},
-					}, 
-					ALICE_Use_AIRGLOW = {
-						DetectorType = "Scanner",
-						StopCommand = "ALICE_END_PIXELLIST",
-						Spice = {"NH_ALICE_AIRGLOW"},
-					},
-					ALICE_Use_AIRGLOW = {
-						DetectorType = "Scanner",
-						StopCommand = "ALICE_END_HISTOGRAM",
-						Spice = {"NH_ALICE_AIRGLOW"},
-					},
-					ALICE_Use_SOCC = {
-						DetectorType = "Scanner",
-						StopCommand = "ALICE_END_PIXELLIST",
-						Spice = {"NH_ALICE_SOC"},
-					},
-					ALICE_Use_SOCC = {
-						DetectorType = "Scanner",
-						StopCommand = "ALICE_END_HISTOGRAM",
-						Spice = {"NH_ALICE_SOC"},
-					},
-                    REX_START = {
-                        DetectorType = "Scanner",
-                        StopCommand = "REX_MODE_OFF",
-                        Spice = { "NH_REX" },
-                    }
-				},				
-				Target ={ 
-					Read  = {
-						"TARGET_NAME",
-						"INSTRUMENT_HOST_NAME",
-						"INSTRUMENT_ID", 
-						"START_TIME", 
-						"STOP_TIME", 
-						"DETECTOR_TYPE",
-						--"SEQUENCE_ID",
-					},
-					Convert = { 
-						PLUTO       = {"PLUTO"       },
-						NEWHORIZONS = {"NEW HORIZONS"},
-						CCD         = {"CAMERA"      },
-						FRAMECCD    = {"SCANNER"     },
-					},
-				},
-			},
-			Instrument = {                
-				Name       = "NH_LORRI",
-				Method     = "ELLIPSOID",
-				Aberration = "NONE",
-				Fovy       = 0.2907,
-				Aspect     = 1,
-				Near       = 0.2,
-				Far        = 10000,
-			},
-            PotentialTargets = {
-				 "PLUTO", 
-				 "CHARON", 
-				 "NIX", 
-				 "HYDRA", 
-				 "P5", 
-				 "P4",
-            }            
-        },
-        Ephemeris = {
-            Type = "Spice",
-            Body = "PLUTO",
-            Reference = "GALACTIC",
-            Observer = "PLUTO BARYCENTER",
-            Kernels = {
-                "${SPICE}/NewHorizonsKernels/nh_plu017.bsp"
-            }
-        },
-        Rotation = {
-            Type = "Spice",
-            Frame = "IAU_PLUTO",
-            Reference = "GALACTIC"
-        },
-        GuiName = "/Solar/Planets/Pluto"
-    },
-	{   
-       Name = "PlutoBarycenterLabel",
-       Parent = "PlutoBarycenter",
-       Renderable = {
-           Type = "RenderablePlane",
-           Billboard = true,
-           Size = { 5, 4 },
-           Texture = "textures/barycenter.png",
-           Atmosphere = {
-               Type = "Nishita", -- for example, values missing etc etc
-               MieFactor = 1.0,
-               MieColor = {1.0, 1.0, 1.0}
-           }
-       },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, 0, 0, 1}
-        },
-    },
-    {
-        Name = "PlutoText",
-        Parent = "PlutoProjection",
-        Renderable = {
-            Type = "RenderablePlane",
-            Size = {1.0, 6.3},
-            Origin = "Center",
-            Billboard = true,
-            Texture = "textures/Pluto-Text.png"
-        },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, -20, 0, 5}
-        }
-    },
-	{
-        Name = "PlutoTexture",
-        Parent = "PlutoProjection",
-        Renderable = {
-            Type = "RenderablePlane",
-            Size = {1.0, 6.4},
-            Origin = "Center",
-            Billboard = true,
-			ProjectionListener = true,
-            Texture = "textures/Pluto-Text.png"
-        },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, 0, 40, 5}
-        }
-    },
-	{
-        Name = "PlutoShadow",
-        Parent = "PlutoProjection",
-        Renderable = {
-            Type = "RenderableShadowCylinder",
-			TerminatorType = "PENUMBRAL", 
-			LightSource = "SUN",
-			Observer = "NEW HORIZONS",
-			Body = "PLUTO",
-			BodyFrame = "IAU_PLUTO",
-			MainFrame = "GALACTIC",
-			Aberration = "NONE",
-        },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, 0, 0, 5}
-        }
-    },
-	-- PlutoBarycentricTrail module
-    {   
-        Name = "PlutoBarycentricTrail",
-        Parent = "PlutoBarycenter",
-        Renderable = {
-            Type = "RenderableTrail",
-            Body = "PLUTO",
-            Frame = "GALACTIC",
-            Observer = "PLUTO BARYCENTER",
-            RGB = {0.00,0.62,1.00},
-            TropicalOrbitPeriod = 120 ,
-            EarthOrbitRatio = 0.03,
-            DayLength = 1,
-            Textures = {
-                Type = "simple",
-                Color = "${COMMON_MODULE}/textures/glare_blue.png",
-                -- need to add different texture
-            },  
-        },
-        GuiName = "/Solar/CharonTrail"
-    },
-  -- PlutoTrail module
-    {   
-        Name = "PlutoTrail",
-        Parent = "SolarSystemBarycenter",
-        Renderable = {
-            Type = "RenderableTrail",
-            Body = "PLUTO BARYCENTER",
-            Frame = "GALACTIC",
-            Observer = "SUN",
-            RGB = { 0.3, 0.7, 0.3 },
-            TropicalOrbitPeriod = 90588 ,
-            EarthOrbitRatio = 248.02,
-            DayLength = 9.9259,
-            Textures = {
-                Type = "simple",
-                Color = "${COMMON_MODULE}/textures/glare_blue.png",
-                -- need to add different texture
-            },  
-        },
-        GuiName = "/Solar/PlutoTrail"
-    }	
-}