From 49309209f6abe8c457ed99cabd9818b9beb6f2e2 Mon Sep 17 00:00:00 2001 From: caes Date: Fri, 10 Jun 2016 09:48:58 -0400 Subject: [PATCH] moved psdlag and still working toward a calibration run --- inputfiles/calibration | 10 ++++++++++ inputfiles/default | 10 ++++++++++ {psdlag/src => src}/.smhist | 0 {psdlag/src => src}/README | 0 {psdlag/src => src}/alglibinternal.cpp | 0 {psdlag/src => src}/alglibinternal.h | 0 {psdlag/src => src}/alglibmisc.cpp | 0 {psdlag/src => src}/alglibmisc.h | 0 {psdlag/src => src}/ap.cpp | 0 {psdlag/src => src}/ap.h | 0 {psdlag/src => src}/check.dat | 0 {psdlag/src => src}/dataanalysis.cpp | 0 {psdlag/src => src}/dataanalysis.h | 0 {psdlag/src => src}/diffequations.cpp | 0 {psdlag/src => src}/diffequations.h | 0 {psdlag/src => src}/fasttransforms.cpp | 0 {psdlag/src => src}/fasttransforms.h | 0 {psdlag/src => src}/fittedlags.dat | 0 {psdlag/src => src}/inc/def.hpp | 0 {psdlag/src => src}/inc/lag.hpp | 0 {psdlag/src => src}/inc/main.hpp | 0 {psdlag/src => src}/inc/mcmc.hpp | 0 {psdlag/src => src}/inc/mod.hpp | 0 {psdlag/src => src}/inc/psd.hpp | 0 {psdlag/src => src}/inc/psdlag.hpp | 0 {psdlag/src => src}/integration.cpp | 0 {psdlag/src => src}/integration.h | 0 {psdlag/src => src}/interpolation.cpp | 0 {psdlag/src => src}/interpolation.h | 0 {psdlag/src => src}/lag.cpp | 0 {psdlag/src => src}/linalg.cpp | 0 {psdlag/src => src}/linalg.h | 0 {psdlag/src => src}/main.cpp | 0 {psdlag/src => src}/makefile | 2 +- {psdlag/src => src}/mcmc.cpp | 0 {psdlag/src => src}/mod.cpp | 0 {psdlag/src => src}/optimization.cpp | 0 {psdlag/src => src}/optimization.h | 0 {psdlag/src => src}/psd.cpp | 0 {psdlag/src => src}/psdlag.cpp | 0 {psdlag/src => src}/solvers.cpp | 0 {psdlag/src => src}/solvers.h | 0 {psdlag/src => src}/specialfunctions.cpp | 0 {psdlag/src => src}/specialfunctions.h | 0 {psdlag/src => src}/statistics.cpp | 0 {psdlag/src => src}/statistics.h | 0 {psdlag/src => src}/stdafx.h | 0 47 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 inputfiles/calibration create mode 100644 inputfiles/default rename {psdlag/src => src}/.smhist (100%) rename {psdlag/src => src}/README (100%) rename {psdlag/src => src}/alglibinternal.cpp (100%) rename {psdlag/src => src}/alglibinternal.h (100%) rename {psdlag/src => src}/alglibmisc.cpp (100%) rename {psdlag/src => src}/alglibmisc.h (100%) rename {psdlag/src => src}/ap.cpp (100%) rename {psdlag/src => src}/ap.h (100%) rename {psdlag/src => src}/check.dat (100%) rename {psdlag/src => src}/dataanalysis.cpp (100%) rename {psdlag/src => src}/dataanalysis.h (100%) rename {psdlag/src => src}/diffequations.cpp (100%) rename {psdlag/src => src}/diffequations.h (100%) rename {psdlag/src => src}/fasttransforms.cpp (100%) rename {psdlag/src => src}/fasttransforms.h (100%) rename {psdlag/src => src}/fittedlags.dat (100%) rename {psdlag/src => src}/inc/def.hpp (100%) rename {psdlag/src => src}/inc/lag.hpp (100%) rename {psdlag/src => src}/inc/main.hpp (100%) rename {psdlag/src => src}/inc/mcmc.hpp (100%) rename {psdlag/src => src}/inc/mod.hpp (100%) rename {psdlag/src => src}/inc/psd.hpp (100%) rename {psdlag/src => src}/inc/psdlag.hpp (100%) rename {psdlag/src => src}/integration.cpp (100%) rename {psdlag/src => src}/integration.h (100%) rename {psdlag/src => src}/interpolation.cpp (100%) rename {psdlag/src => src}/interpolation.h (100%) rename {psdlag/src => src}/lag.cpp (100%) rename {psdlag/src => src}/linalg.cpp (100%) rename {psdlag/src => src}/linalg.h (100%) rename {psdlag/src => src}/main.cpp (100%) rename {psdlag/src => src}/makefile (51%) rename {psdlag/src => src}/mcmc.cpp (100%) rename {psdlag/src => src}/mod.cpp (100%) rename {psdlag/src => src}/optimization.cpp (100%) rename {psdlag/src => src}/optimization.h (100%) rename {psdlag/src => src}/psd.cpp (100%) rename {psdlag/src => src}/psdlag.cpp (100%) rename {psdlag/src => src}/solvers.cpp (100%) rename {psdlag/src => src}/solvers.h (100%) rename {psdlag/src => src}/specialfunctions.cpp (100%) rename {psdlag/src => src}/specialfunctions.h (100%) rename {psdlag/src => src}/statistics.cpp (100%) rename {psdlag/src => src}/statistics.h (100%) rename {psdlag/src => src}/stdafx.h (100%) diff --git a/inputfiles/calibration b/inputfiles/calibration new file mode 100644 index 0000000..c5b4bc5 --- /dev/null +++ b/inputfiles/calibration @@ -0,0 +1,10 @@ +2 +../data/calibration/lc_drive.dat 0 +../data/calibration/lc_1.dat 0 +1 5e-3 5e-1 +0 +1 1 1 1 +0:1 1 +0 +0 +100 50 50 mcmc.dat \ No newline at end of file diff --git a/inputfiles/default b/inputfiles/default new file mode 100644 index 0000000..2a2ccc0 --- /dev/null +++ b/inputfiles/default @@ -0,0 +1,10 @@ +1 +../data/calibration/lc_1.dat 0 +3 1e-5 1e-4 5e-4 1e-3 +1 +1 1 1 1 1 1 1 1 1 1 1 1 +0 1 +0 +0 +100 50 50 mcmc.dat + diff --git a/psdlag/src/.smhist b/src/.smhist similarity index 100% rename from psdlag/src/.smhist rename to src/.smhist diff --git a/psdlag/src/README b/src/README similarity index 100% rename from psdlag/src/README rename to src/README diff --git a/psdlag/src/alglibinternal.cpp b/src/alglibinternal.cpp similarity index 100% rename from psdlag/src/alglibinternal.cpp rename to src/alglibinternal.cpp diff --git a/psdlag/src/alglibinternal.h b/src/alglibinternal.h similarity index 100% rename from psdlag/src/alglibinternal.h rename to src/alglibinternal.h diff --git a/psdlag/src/alglibmisc.cpp b/src/alglibmisc.cpp similarity index 100% rename from psdlag/src/alglibmisc.cpp rename to src/alglibmisc.cpp diff --git a/psdlag/src/alglibmisc.h b/src/alglibmisc.h similarity index 100% rename from psdlag/src/alglibmisc.h rename to src/alglibmisc.h diff --git a/psdlag/src/ap.cpp b/src/ap.cpp similarity index 100% rename from psdlag/src/ap.cpp rename to src/ap.cpp diff --git a/psdlag/src/ap.h b/src/ap.h similarity index 100% rename from psdlag/src/ap.h rename to src/ap.h diff --git a/psdlag/src/check.dat b/src/check.dat similarity index 100% rename from psdlag/src/check.dat rename to src/check.dat diff --git a/psdlag/src/dataanalysis.cpp b/src/dataanalysis.cpp similarity index 100% rename from psdlag/src/dataanalysis.cpp rename to src/dataanalysis.cpp diff --git a/psdlag/src/dataanalysis.h b/src/dataanalysis.h similarity index 100% rename from psdlag/src/dataanalysis.h rename to src/dataanalysis.h diff --git a/psdlag/src/diffequations.cpp b/src/diffequations.cpp similarity index 100% rename from psdlag/src/diffequations.cpp rename to src/diffequations.cpp diff --git a/psdlag/src/diffequations.h b/src/diffequations.h similarity index 100% rename from psdlag/src/diffequations.h rename to src/diffequations.h diff --git a/psdlag/src/fasttransforms.cpp b/src/fasttransforms.cpp similarity index 100% rename from psdlag/src/fasttransforms.cpp rename to src/fasttransforms.cpp diff --git a/psdlag/src/fasttransforms.h b/src/fasttransforms.h similarity index 100% rename from psdlag/src/fasttransforms.h rename to src/fasttransforms.h diff --git a/psdlag/src/fittedlags.dat b/src/fittedlags.dat similarity index 100% rename from psdlag/src/fittedlags.dat rename to src/fittedlags.dat diff --git a/psdlag/src/inc/def.hpp b/src/inc/def.hpp similarity index 100% rename from psdlag/src/inc/def.hpp rename to src/inc/def.hpp diff --git a/psdlag/src/inc/lag.hpp b/src/inc/lag.hpp similarity index 100% rename from psdlag/src/inc/lag.hpp rename to src/inc/lag.hpp diff --git a/psdlag/src/inc/main.hpp b/src/inc/main.hpp similarity index 100% rename from psdlag/src/inc/main.hpp rename to src/inc/main.hpp diff --git a/psdlag/src/inc/mcmc.hpp b/src/inc/mcmc.hpp similarity index 100% rename from psdlag/src/inc/mcmc.hpp rename to src/inc/mcmc.hpp diff --git a/psdlag/src/inc/mod.hpp b/src/inc/mod.hpp similarity index 100% rename from psdlag/src/inc/mod.hpp rename to src/inc/mod.hpp diff --git a/psdlag/src/inc/psd.hpp b/src/inc/psd.hpp similarity index 100% rename from psdlag/src/inc/psd.hpp rename to src/inc/psd.hpp diff --git a/psdlag/src/inc/psdlag.hpp b/src/inc/psdlag.hpp similarity index 100% rename from psdlag/src/inc/psdlag.hpp rename to src/inc/psdlag.hpp diff --git a/psdlag/src/integration.cpp b/src/integration.cpp similarity index 100% rename from psdlag/src/integration.cpp rename to src/integration.cpp diff --git a/psdlag/src/integration.h b/src/integration.h similarity index 100% rename from psdlag/src/integration.h rename to src/integration.h diff --git a/psdlag/src/interpolation.cpp b/src/interpolation.cpp similarity index 100% rename from psdlag/src/interpolation.cpp rename to src/interpolation.cpp diff --git a/psdlag/src/interpolation.h b/src/interpolation.h similarity index 100% rename from psdlag/src/interpolation.h rename to src/interpolation.h diff --git a/psdlag/src/lag.cpp b/src/lag.cpp similarity index 100% rename from psdlag/src/lag.cpp rename to src/lag.cpp diff --git a/psdlag/src/linalg.cpp b/src/linalg.cpp similarity index 100% rename from psdlag/src/linalg.cpp rename to src/linalg.cpp diff --git a/psdlag/src/linalg.h b/src/linalg.h similarity index 100% rename from psdlag/src/linalg.h rename to src/linalg.h diff --git a/psdlag/src/main.cpp b/src/main.cpp similarity index 100% rename from psdlag/src/main.cpp rename to src/main.cpp diff --git a/psdlag/src/makefile b/src/makefile similarity index 51% rename from psdlag/src/makefile rename to src/makefile index b08eaf1..e3b613b 100644 --- a/psdlag/src/makefile +++ b/src/makefile @@ -1,6 +1,6 @@ -incdir='/home/caes/science/fourier-agn/psdlag/src/' +incdir='/home/caes/science/psdlag-agn/src/' psdlag: diff --git a/psdlag/src/mcmc.cpp b/src/mcmc.cpp similarity index 100% rename from psdlag/src/mcmc.cpp rename to src/mcmc.cpp diff --git a/psdlag/src/mod.cpp b/src/mod.cpp similarity index 100% rename from psdlag/src/mod.cpp rename to src/mod.cpp diff --git a/psdlag/src/optimization.cpp b/src/optimization.cpp similarity index 100% rename from psdlag/src/optimization.cpp rename to src/optimization.cpp diff --git a/psdlag/src/optimization.h b/src/optimization.h similarity index 100% rename from psdlag/src/optimization.h rename to src/optimization.h diff --git a/psdlag/src/psd.cpp b/src/psd.cpp similarity index 100% rename from psdlag/src/psd.cpp rename to src/psd.cpp diff --git a/psdlag/src/psdlag.cpp b/src/psdlag.cpp similarity index 100% rename from psdlag/src/psdlag.cpp rename to src/psdlag.cpp diff --git a/psdlag/src/solvers.cpp b/src/solvers.cpp similarity index 100% rename from psdlag/src/solvers.cpp rename to src/solvers.cpp diff --git a/psdlag/src/solvers.h b/src/solvers.h similarity index 100% rename from psdlag/src/solvers.h rename to src/solvers.h diff --git a/psdlag/src/specialfunctions.cpp b/src/specialfunctions.cpp similarity index 100% rename from psdlag/src/specialfunctions.cpp rename to src/specialfunctions.cpp diff --git a/psdlag/src/specialfunctions.h b/src/specialfunctions.h similarity index 100% rename from psdlag/src/specialfunctions.h rename to src/specialfunctions.h diff --git a/psdlag/src/statistics.cpp b/src/statistics.cpp similarity index 100% rename from psdlag/src/statistics.cpp rename to src/statistics.cpp diff --git a/psdlag/src/statistics.h b/src/statistics.h similarity index 100% rename from psdlag/src/statistics.h rename to src/statistics.h diff --git a/psdlag/src/stdafx.h b/src/stdafx.h similarity index 100% rename from psdlag/src/stdafx.h rename to src/stdafx.h