Changeset 19386 for trunk/FACT++

Timestamp:

11/12/18 21:47:51 (6 years ago)

Author:

tbretz

Message:

Prefix file paths if they are not absolute (should not change anything as right now, --prefix is not defined.

Location:

trunk/FACT++/src

Files:

• biasctrl.cc (modified) (1 diff)
• drivectrl.cc (modified) (1 diff)
• feedback.cc (modified) (1 diff)
• fscctrl.cc (modified) (2 diffs)
• ratecontrol.cc (modified) (1 diff)
• smartfact.cc (modified) (1 diff)

trunk/FACT++/src/biasctrl.cc

@@ -2262 +2262 @@
         {
             if (conf.Has("bias-map-file"))
-                map.Read(conf.Get<string>("bias-map-file"));
+                map.Read(conf.GetPrefixedString("bias-map-file"));
 
             //if (conf.Has("bias-database"))

trunk/FACT++/src/drivectrl.cc

@@ -3044 +3044 @@
         fDeviationMax     = conf.Get<uint16_t>("deviation-max");
 
-        const string fname = conf.Get<string>("pointing.model-file");
+        const string fname = conf.GetPrefixedString("pointing.model-file");
 
         try

trunk/FACT++/src/feedback.cc

@@ -1329 +1329 @@
         fIsVerbose = !conf.Get<bool>("quiet");
 
-        if (!fMap.Read(conf.Get<string>("pixel-map-file")))
+        if (!fMap.Read(conf.GetPrefixedString("pixel-map-file")))
         {
             Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");

trunk/FACT++/src/fscctrl.cc

@@ -859 +859 @@
         fFSC.SetVerbose(!conf.Get<bool>("quiet"));
 
-        const string fname1 = conf.Get<string>("sensor-pos-file");
+        const string fname1 = conf.GetPrefixedString("sensor-pos-file");
         const auto v1 = Interpolator2D::ReadGrid(fname1);
         if (v1.size() != 31)
@@ -867 +867 @@
         }
 
-        const string fname2 = conf.Get<string>("patch-pos-file");
+        const string fname2 = conf.GetPrefixedString("patch-pos-file");
         const auto v2 = Interpolator2D::ReadGrid(fname2);
         if (v2.size() != 320)

trunk/FACT++/src/ratecontrol.cc

@@ -862 +862 @@
         fVerbose = !conf.Get<bool>("quiet");
 
-        if (!fMap.Read(conf.Get<string>("pixel-map-file")))
+        if (!fMap.Read(conf.GetPrefixedString("pixel-map-file")))
         {
             Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");

trunk/FACT++/src/smartfact.cc

@@ -3476 +3476 @@
     int EvalOptions(Configuration &conf)
     {
-        if (!fPixelMap.Read(conf.Get<string>("pixel-map-file")))
+        if (!fPixelMap.Read(conf.GetPrefixedString("pixel-map-file")))
         {
             Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");