Changeset 19386


Ignore:
Timestamp:
Nov 12, 2018, 9:47:51 PM (12 months 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/biasctrl.cc

    r18964 r19386  
    22622262        {
    22632263            if (conf.Has("bias-map-file"))
    2264                 map.Read(conf.Get<string>("bias-map-file"));
     2264                map.Read(conf.GetPrefixedString("bias-map-file"));
    22652265
    22662266            //if (conf.Has("bias-database"))
  • trunk/FACT++/src/drivectrl.cc

    r19139 r19386  
    30443044        fDeviationMax     = conf.Get<uint16_t>("deviation-max");
    30453045
    3046         const string fname = conf.Get<string>("pointing.model-file");
     3046        const string fname = conf.GetPrefixedString("pointing.model-file");
    30473047
    30483048        try
  • trunk/FACT++/src/feedback.cc

    r18975 r19386  
    13291329        fIsVerbose = !conf.Get<bool>("quiet");
    13301330
    1331         if (!fMap.Read(conf.Get<string>("pixel-map-file")))
     1331        if (!fMap.Read(conf.GetPrefixedString("pixel-map-file")))
    13321332        {
    13331333            Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");
  • trunk/FACT++/src/fscctrl.cc

    r18959 r19386  
    859859        fFSC.SetVerbose(!conf.Get<bool>("quiet"));
    860860
    861         const string fname1 = conf.Get<string>("sensor-pos-file");
     861        const string fname1 = conf.GetPrefixedString("sensor-pos-file");
    862862        const auto v1 = Interpolator2D::ReadGrid(fname1);
    863863        if (v1.size() != 31)
     
    867867        }
    868868
    869         const string fname2 = conf.Get<string>("patch-pos-file");
     869        const string fname2 = conf.GetPrefixedString("patch-pos-file");
    870870        const auto v2 = Interpolator2D::ReadGrid(fname2);
    871871        if (v2.size() != 320)
  • trunk/FACT++/src/ratecontrol.cc

    r18975 r19386  
    862862        fVerbose = !conf.Get<bool>("quiet");
    863863
    864         if (!fMap.Read(conf.Get<string>("pixel-map-file")))
     864        if (!fMap.Read(conf.GetPrefixedString("pixel-map-file")))
    865865        {
    866866            Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");
  • trunk/FACT++/src/smartfact.cc

    r19380 r19386  
    34763476    int EvalOptions(Configuration &conf)
    34773477    {
    3478         if (!fPixelMap.Read(conf.Get<string>("pixel-map-file")))
     3478        if (!fPixelMap.Read(conf.GetPrefixedString("pixel-map-file")))
    34793479        {
    34803480            Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");
Note: See TracChangeset for help on using the changeset viewer.