From 0734189f63b0d5b8fa4269e672265e3f2069e312 Mon Sep 17 00:00:00 2001
From: Carl Philipp Klemm <philipp@uvos.xyz>
Date: Thu, 16 Nov 2023 11:45:21 +0100
Subject: [PATCH] eisgenerator_export: print an eisfile to stdout instead of a
custom format
---
density.p | 2 +-
eisgenerator_plot | 2 +-
kissplotcsv | 17 ++++++++---------
main.cpp | 7 +++----
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/density.p b/density.p
index 8902f48..aec6e53 100644
--- a/density.p
+++ b/density.p
@@ -3,4 +3,4 @@ list = system(glob)
print list
set datafile separator ','
unset key
-plot for [file in list] file using 2:3 every ::2 w l lw 2 lc rgb "#F00000FF"
+plot for [file in list] file using 2:3 every ::2 notitle w l ls 1 lw 2 lc rgb "#F00000FF"
diff --git a/eisgenerator_plot b/eisgenerator_plot
index 6ca0ce9..96eb0fa 100755
--- a/eisgenerator_plot
+++ b/eisgenerator_plot
@@ -19,5 +19,5 @@ set tics font \"Helvetica,12\"; \
set xlabel font \"Helvetica,15\"; \
set ylabel font \"Helvetica,15\"; \
set datafile separator ','; \
-plot '-' using 2:3 notitle w l ls 1;
+plot '-' using 2:3 skip 3 notitle w l;
"
diff --git a/kissplotcsv b/kissplotcsv
index 2db6116..8e7a7c8 100755
--- a/kissplotcsv
+++ b/kissplotcsv
@@ -1,16 +1,15 @@
-#!/bin/sh
+#!/bin/bash -e
-if ! command -v eisgenerator_export &> /dev/null
-then
- echo "eisgenerator_export is required in \$PATH"
- exit
-elif ! command -v gnuplot &> /dev/null
-then
+if ! command -v gnuplot &> /dev/null; then
echo "gnuplot is required in \$PATH"
exit
fi
-cat "$1" | gnuplot -p -e "\
+if [[ $# < 1 ]]; then
+ echo "Usage: kisscsvplot [FILE]"
+fi
+
+gnuplot -p -e "\
set terminal qt enhanced font \",15\" title \"EIS Plot\"; \
set style line 1 lw 3 lc \"blue\"; \
set ylabel 'Z_{im}'; \
@@ -19,5 +18,5 @@ set tics font \"Helvetica,12\"; \
set xlabel font \"Helvetica,15\"; \
set ylabel font \"Helvetica,15\"; \
set datafile separator ','; \
-plot '-' using 2:3 notitle w l ls 1;
+plot '$1' using 2:3 notitle w l ls 3;
"
diff --git a/main.cpp b/main.cpp
index 7c25bcc..8667dca 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,4 @@
+#include <eisgenerator/eistype.h>
#include <iostream>
#include <complex>
#include <chrono>
@@ -67,11 +68,9 @@ static void runSweep(const Config& config, eis::Model& model)
if(config.noise > 0)
eis::noise(results, config.noise, false);
- eis::Log(eis::Log::INFO)<<(config.hertz ? "freqency" : "omega")<<",real,im";
+ eis::EisSpectra spectra(results, model.getModelStrWithParam(), "exported by eisgenerator_export");
- for(const eis::DataPoint& res : results)
- std::cout<<(config.hertz ? res.omega/(2*M_PI) : res.omega)<<','<<
- res.im.real()<<','<<(config.invert ? 0-res.im.imag() : res.im.imag())<<'\n';
+ spectra.saveToStream(std::cout);
eis::Log(eis::Log::INFO)<<"time taken: "<<duration.count()<<" us";
--
GitLab