Merge pull request #2215 from gemini-hlsw/REL-4280

REL-4280 Fixes for IGRINS-2 support on obslog
gemini-hlsw · Dec 21, 2023 · 52daedb · 52daedb
2 parents 080bc6b + c5aa2f0
commit 52daedb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 33 deletions.
diff --git a/app/spdb/build.sbt b/app/spdb/build.sbt
@@ -29,7 +29,6 @@ ocsAppManifest := {
           sraaphorst(v),
           anunez(v),
           astephens(v),
-          osmirnova(v),
           with_remote_gogo(v),
             odbtest(v),
               gsodbtest(v),
@@ -274,12 +273,14 @@ def cquiroz(version: Version) = AppConfig(
   distribution = List(TestDistro),
   vmargs = List(
     "-Xss1536K",
-    "-Xmx1024M",
+    "-Xms6G",
+    "-Xmx14G",
+    "-XX:+UseConcMarkSweepGC",
     "-Dedu.gemini.site=south"
   ),
   props = Map(
-    "edu.gemini.spdb.dir"                  -> "/Users/carlos.quiroz/.spdb/",
-    "edu.gemini.auxfile.root"              -> "/Users/carlos.quiroz/.auxfile",
+    "edu.gemini.spdb.dir"                  -> "/Users/cquiroz/.spdb/",
+    "edu.gemini.auxfile.root"              -> "/Users/cquiroz/.spdb/.auxfile",
     "edu.gemini.dataman.gsa.summit.host"   -> "cpofits-lv1new.cl.gemini.edu",
     "edu.gemini.services.server.start"     -> "false",
     "edu.gemini.util.trpc.name"            -> "Carlos's ODB (Test)",
@@ -362,33 +363,6 @@ def astephens(version: Version) = AppConfig(
   )
 ) extending List(with_gogo(version), fnussber_credentials(version))
 
-// OSMIRNOVA
-def osmirnova(version: Version) = AppConfig(
-  id = "osmirnova",
-  distribution = List(TestDistro),
-  vmargs = List(
-    "-Xss1536K",
-    "-Xmx2000M",
-    "-Dedu.gemini.site=north",
-    "-Dcron.*.edu.gemini.dbTools.html.ftpHost=localhost",
-    "-Dcron.*.edu.gemini.dbTools.html.ftpDestDir=/Users/osmirnov/.spdb/sftp",
-    "-Dcron.reports.edu.gemini.spdb.reports.public.host=localhost",
-    "-Dcron.reports.edu.gemini.spdb.reports.public.remotedir=/Users/osmirnov/.spdb/cron",
-    "-Dcron.archive.edu.gemini.dbTools.html.ftpHost=localhost",
-    "-Dcron.archive.edu.gemini.dbTools.html.ftpDestDir=/Users/osmirnov/.spdb/cron"
-  ),
-  props = Map(
-    "edu.gemini.smartgcal.host"          -> "localhost",
-    "edu.gemini.spdb.dir"                -> "/Users/osmirnov/.spdb/",
-    "edu.gemini.auxfile.root"            -> "/Users/osmirnov/.auxfile",
-    "edu.gemini.dataman.gsa.summit.host" -> "mkofits-lv1new.hi.gemini.edu",
-    "edu.gemini.util.trpc.name"          -> "Florian's ODB (Test)",
-    "edu.gemini.auxfile.fits.dest"       -> "/gemsoft/var/data/ictd/test/GS@SEMESTER@/@PROG_ID@",
-    "edu.gemini.auxfile.other.dest"      -> "/gemsoft/var/data/finder/GSqueue/Finders-Test/@SEMESTER@/@PROG_ID@",
-    "edu.gemini.auxfile.fits.host"       -> "gsconfig.gemini.edu"
-  )
-) extending List(with_gogo(version), olesja_credentials(version))
-
 // ODBTEST
 def odbtest(version: Version) = AppConfig(
   id = "odbtest",

diff --git a/bundle/edu.gemini.obslog/src/main/java/edu/gemini/obslog/instruments/Igrins2LogSegment.java b/bundle/edu.gemini.obslog/src/main/java/edu/gemini/obslog/instruments/Igrins2LogSegment.java
@@ -5,6 +5,7 @@
 import edu.gemini.obslog.obslog.ConfigMap;
 import edu.gemini.obslog.obslog.InstrumentLogSegment;
 import edu.gemini.obslog.obslog.OlLogOptions;
+import edu.gemini.pot.sp.SPComponentType;
 import edu.gemini.spModel.type.LoggableSpType;
 
 import java.util.List;
@@ -17,7 +18,7 @@
 public class Igrins2LogSegment extends InstrumentLogSegment {
     public static final Logger LOG = Logger.getLogger(Igrins2LogSegment.class.getName());
 
-    private static final String NARROW_TYPE = "Igrins2";
+    private static final String NARROW_TYPE = SPComponentType.INSTRUMENT_IGRINS2.narrowType;
     public static final OlSegmentType SEG_TYPE = new OlSegmentType(NARROW_TYPE);
 
     private static final String SEGMENT_CAPTION = "Igrins2 Observing Log";

diff --git a/bundle/edu.gemini.obslog/src/main/resources/ObsLogConfig.xml b/bundle/edu.gemini.obslog/src/main/resources/ObsLogConfig.xml
@@ -1015,7 +1015,7 @@
         <entry key="datasetcomments"/>
     </logEntry>
 
-    <logEntry key="Igrins2">
+    <logEntry key="IGRINS-2">
         <entry key="observationid"/>
         <entry key="datasetut"/>
         <entry key="datalabels"/>