Tweak c_scan script to facilitate refine

scripts/DSF_iK.py

@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+
 import argparse
 import plotly.graph_objects as go
 import numpy

scripts/Histograms.py

@@ -1,3 +1,5 @@
+#! /usr/bin/env python
+
 import argparse
 import plotly.graph_objects as go
 import numpy
@@ -16,5 +18,3 @@ for datafilename in args.filenames:
 	y = [line[3] for line in data]
 	fig.add_trace(go.Bar(x=x, y=y))
 fig.show()
-
-

scripts/Histograms_Animated.py

@@ -1,3 +1,5 @@
+#! /usr/bin/env python
+
 import argparse
 import plotly.graph_objects as go
 import numpy
@@ -35,4 +37,3 @@ fig.update_layout(
 	sliders=sliders
 )
 fig.show()
-

scripts/catalogue/c_scan_N_fixed_data.sh

@@ -7,8 +7,8 @@
 # The data can then be used to produce animated graphs (with c_int evolving),
 # see the `c_scan_N_fixed_dsfs[_plot]` scripts.
 
-if [[ $# -ne 5 ]]; then
-    echo "Arguments needed: whichDSF, kBT, target_sumrule, N, nkmax (max momentum in units of kF/4)."
+if [[ $# -ne 7 ]]; then
+    echo "Arguments needed: whichDSF, kBT, target_sumrule, N, nkmax (max momentum in units of kF/4), Max_Secs (per c), refine."
     exit 1
 fi
 
@@ -37,6 +37,16 @@ if [[ $5 -lt 0 ]]; then
     exit 1
 fi
 
+if [[ $6 -lt 0 ]]; then
+    echo "Max_Secs must be > 0."
+    exit 1
+fi
+
+if [[ $7 != 0 && $7 != 1 ]]; then
+    echo "refine must be 0 (false) or 1 (true)."
+    exit 1
+fi
+
 timestart=$(date +%s)
 
 whichDSF=$1
@@ -44,6 +54,8 @@ kBT=$2
 target_sumrule=$3
 N=$4
 nkmax=$5
+Max_Secs=$6
+refine=$7
 
 correlator='rho-rho'
 if [[ $whichDSF == 'o' ]]; then
@@ -58,8 +70,6 @@ touch $logfile
 
 iKmax=$(($nkmax * $N/8))
 
-Max_Secs=3600
-refine=0
 
 # List of interactions: fractional powers of 2
 clist_raw=()
@@ -87,7 +97,7 @@ dircheck='Lieb-Liniger/'$correlator'/T_'$kBT'/c_scan_N_fixed/k_0_to_'${(l:2::0:)
 if [[ -d $dircheck ]]; then
     echo 'A c scan with these parameters already exists. Aborting.'
     echo 'If you really want to run this command, please first delete directory:\n'$dircheck
-    exit
+    exit 1
 fi
 
 

scripts/plot_benchmarks.py

@@ -1,3 +1,5 @@
+#! /usr/bin/env python
+
 """
 Plot benchmark files produced from Benchmark_RAW_File.