tables dir location search algorithm updated

src/app/crbeam/CMakeLists.txt

@@ -34,6 +34,6 @@ CRbeam.h
 )
 add_link_options(-fopenmp)
 add_executable(CRbeam ${SOURCE_FILES})
-target_link_libraries(CRbeam mcray ${BOOST_SYS_LIBRARY} ${BOOST_FS_LIBRARY} ${C_LIBRARY} ${GSL_LIBRARY} ${GSLCBLAS_LIBRARY})
+target_link_libraries(CRbeam mcray ${BOOST_SYS_LIBRARY} ${BOOST_FS_LIBRARY} ${C_LIBRARY} ${GSL_LIBRARY} ${GSLCBLAS_LIBRARY} ${CMAKE_DL_LIBS})
 
 

src/app/crbeam/CRbeam.cpp

@@ -68,7 +68,7 @@ using namespace cors::cmdline;
  */
 int user_main(int argc, char** argv) {
     std::cout << "Number of available threads: " << omp_thread_count() << std::endl;
-	std::cout << "tables path: " << shared_tables_path() << std::endl;
+	std::cout << "Using tables path: " << tables_dir << std::endl;
 
 	CRbeam prog(argc, argv);
 	return prog.run();

src/lib/Background.cpp

@@ -107,7 +107,7 @@ void TableBackground::Init(std::string aDir, const char** aFileList, bool aIsLog
 {
 	//the files should be ordered increasingly?
 	//x scale should by monotonic with increasing order
-	aDir = TABLES_DIR + aDir;
+	aDir = tables_dir + aDir;
 	double lastZ = -1;
 	for(int iZ=0; aFileList[iZ]; iZ++)
 	{
@@ -162,7 +162,7 @@ MatrixBackground::MatrixBackground(std::string aName, std::string aTableFile, bo
 	const size_t bufSize = 1048576;//1M
 	fBuffer = new char[bufSize];
 	std::istream_iterator<double> eos;
-	aTableFile = TABLES_DIR + aTableFile;
+	aTableFile = tables_dir + aTableFile;
 	std::ifstream file(aTableFile.c_str());
 
 	if(!file.good())

src/lib/Deflection3D.cpp

@@ -247,6 +247,7 @@ namespace Interactions {
         double Bgauss = 10.;
         MonochromaticMF mf(r,lambdaMpc,Bgauss);
         mf.Print(lambdaMpc);
+        return 0;
     }
 
     int Deflection3D::UnitTest() {

src/lib/GZK.cpp

@@ -51,7 +51,7 @@ GZK::GZK(BackgroundIntegral* aBackground, int aRandSeed):fBackground(aBackground
 
 Function* GZK::InitSigma(ParticleType aPrim)
 {
-    std::string tablesDir = TABLES_DIR "sophia2/";
+    std::string tablesDir = tables_dir + "sophia2/";
     Utils::TableReader reader(tablesDir+(aPrim==Proton?"p":"n"), 2);
     std::vector<double>& s = reader.getColumn(0);
     std::vector<double>& sigma = reader.getColumn(1);

src/lib/MathUtils.cpp

@@ -975,6 +975,7 @@ template bool MathUtils::SampleLogscaleDistribution<double>(const Function& aDis
 		//Sampler4<double> dil;
 		NRSampler<double> dil;
 		dil.UnitTest();
+        return 0;
 	}
 
 double MathUtils::Integration_qag (

src/lib/Stecker16Background.cpp

@@ -32,11 +32,11 @@
 namespace Backgrounds {
 
     Stecker16LowerBackground::Stecker16LowerBackground() :
-            Stecker16Background(TABLES_DIR  "stecker_ebl16/comoving_enerdens_lo.csv", "Stecker_16_lower") {
+            Stecker16Background(tables_dir + "stecker_ebl16/comoving_enerdens_lo.csv", "Stecker_16_lower") {
 }
 
 Stecker16UpperBackground::Stecker16UpperBackground() :
-        Stecker16Background(TABLES_DIR "stecker_ebl16/comoving_enerdens_up.csv", "Stecker_16_upper")
+        Stecker16Background(tables_dir + "stecker_ebl16/comoving_enerdens_up.csv", "Stecker_16_upper")
 {
 }
 
@@ -55,6 +55,7 @@ int Stecker16Background::UnitTest()
     BackgroundUtils::UnitTest(backgrUpper);
     Stecker16LowerBackground backgrLower;
     BackgroundUtils::UnitTest(backgrLower);
+    return 0;
 }
 
 }

src/lib/SteckerEBL.cpp

@@ -36,7 +36,7 @@ namespace Backgrounds {
 
 #define IRO_DATA_FILE "iro_stecker2005"
     Stecker2005EBL::Stecker2005EBL():
-            CTableWithHeaderReader(TABLES_DIR IRO_DATA_FILE),
+            CTableWithHeaderReader((tables_dir + IRO_DATA_FILE).c_str()),
     m_accuracyE(0),
     m_accuracyZ(0),
     m_curE(0)

src/lib/Utils.cpp

@@ -36,52 +36,34 @@ namespace fs = boost::filesystem;
 
 namespace Utils {
 
-    const char PathSeparator =
-#ifdef _WIN32
-                            '\\';
-#else
-                            '/';
-#endif
+    const char PathSeparator = DIR_DELIMITER_STR[0];
 
-
-    std::string shared_tables_path(){
+    std::string default_tables_path(){
+        // On conda env installations tables are stored in shared folder
+        // For standalone installations tables are stored in bin folder
         std::string tables_folder_name("tables");
         fs::path prog_path = boost::dll::program_location();
+        fs::path prog_name = prog_path.stem().string();
+        fs::path prog_dir = prog_path.parent_path();
+        fs::path shared_tables_dir = prog_dir.parent_path() / "shared" / prog_name / tables_folder_name;
+        fs::path exe_tables_dir = prog_dir / tables_folder_name;
 
-        // for some reason boost::filesystem::path.parent_path() and fs::canonical didn't work properly os my Mac OS so we do it manually
+        if(fs::is_directory(shared_tables_dir))
+            return shared_tables_dir.string();
+        if(fs::is_directory(exe_tables_dir))
+            return exe_tables_dir.string();
 
-        std::stringstream path(prog_path.string());
-        std::string segment;
-        std::vector<std::string> seglist;
+        // we don't check for existence of './tables' and
+        // don't throw exception here since on some platforms fs::is_directory doesn't work properly
+        std::cerr << "WARNING: Neither " << shared_tables_dir.string() << " nor \n" << exe_tables_dir.string() <<
+        " was found.\n You can download latest tables from\n" <<
+        "https://github.com/okolo/mcray/tree/main/bin/tables\n";
 
-        while(std::getline(path, segment, PathSeparator))
-        {
-            seglist.push_back(segment);
-        }
-
-        if(seglist.size() >= 3){
-            std::string app_name = seglist.back();
-            seglist.pop_back();
-            seglist.pop_back();
-            seglist.push_back(std::string("shared"));
-            seglist.push_back(app_name);
-            seglist.push_back(tables_folder_name);
-            std::ostringstream os;
-            for(std::string& seg : seglist){
-                os << seg << PathSeparator;
-            }
-            std::string table_dir = os.str();
-            table_dir.pop_back();
-            std::cout << "extracted path:" << table_dir << "\n\n";
-            fs::path p = fs::path(table_dir);
-            if(fs::exists(fs::status(p)))
-                return table_dir;
-            else
-                std::cout << "type " << fs::status(p).type() << "\n\n";
-        }
-        return tables_folder_name + PathSeparator;
+        return tables_folder_name;
     }
 
+    std::string tables_dir = default_tables_path() + DIR_DELIMITER_STR;
+
     int omp_thread_count() {
         int n = 0;
 #pragma omp parallel reduction(+:n)

src/lib/Utils.h

@@ -43,10 +43,18 @@
 
 namespace Utils {
 
-std::string shared_tables_path();
+std::string default_tables_path();
 
+
+
+#ifdef _WIN32
+#define DIR_DELIMITER_STR "\\"
+#else
 #define DIR_DELIMITER_STR "/"
-#define TABLES_DIR "tables" DIR_DELIMITER_STR
+#endif
+
+extern std::string tables_dir;
+//#define TABLES_DIR "tables" DIR_DELIMITER_STR
 
 class Exception
 {