Rework catalogue building

scripts/build_LiebLin_catalogue_k_fixed.sh

@@ -42,7 +42,15 @@ kBT=$2
 target_sumrule=$3
 nr_minutes=$4
 
-logfile='run_'$whichDSF'_kBT_'$kBT'_sr_'$target_sumrule'_'$(date '+%Y-%m-%d-%Hh%M')'.log'
+correlator='rho-rho'
+if [[ $whichDSF == 'o' ]]; then
+    correlator='psidag-psi'
+elif [[ $whichDSF == 'g' ]]; then
+    correlator='psi-psidag'
+fi
+
+mkdir -p logs
+logfile='logs/run_'$whichDSF'_kBT_'$kBT'_sr_'$target_sumrule'_'$(date '+%Y-%m-%d-%Hh%M')'.log'
 touch $logfile
 
 clist=(1024 512 256 128 64 32 16 8 4 2 1 0.5 0.25 0.125 0.0625 0.03125 0.015625)
@@ -55,11 +63,11 @@ do
     for nk in {1..16}
     do
 	echo 'Starting run for c =' $c', kfact = '$nk | tee -a $logfile
-	dir='c_'$c'/kBT_'$kBT'/k_fixed/k_'${(l:2::0:)nk}'kFo4/sr_'$target_sumrule
+	dir='Lieb-Liniger/'$correlator'/T_'$kBT'/c_'$c'/k_fixed/k_'${(l:2::0:)nk}'kFo4/sr_'$target_sumrule'/prelim'
 	mkdir -p $dir
 	cd $dir
 	LiebLin_Catalogue_Fixed_c_k_Nscaling $whichDSF $c $nk $kBT $target_sumrule 0 $nr_minutes | tee -a $basedir/$logfile
 	cd $basedir
-	echo ' Successfully completed run for c =' $c', kfact = '$nk'\n' | tee -a $logfile
+	echo 'Successfully completed run for c =' $c', kfact = '$nk'\n' | tee -a $logfile
     done
 done

scripts/build_LiebLin_catalogue_k_fixed_dsfs.sh

@@ -35,6 +35,13 @@ kBT=$2
 target_sumrule=$3
 width=$4
 
+correlator='rho-rho'
+if [[ $whichDSF == 'o' ]]; then
+    correlator='psidag-psi'
+elif [[ $whichDSF == 'g' ]]; then
+    correlator='psi-psidag'
+fi
+
 clist=(1024 512 256 128 64 32 16 8 4 2 1 0.5 0.25 0.125 0.0625 0.03125 0.015625)
 
 basedir="$(pwd)"
@@ -53,16 +60,18 @@ do
 	ommax=$(($nk*($nk + 8)))
 	# Number of points:
 	Nom=1000
-	echo 'Starting computation of DSFs for c =' $c', kfact = '$nk | tee -a $logfile
-	dir='c_'$c'/kBT_'$kBT'/k_fixed/k_'${(l:2::0:)nk}'kFo4/sr_'$target_sumrule
+	echo 'Starting computation of DSFs for c =' $c', kfact = '$nk
+	dir='Lieb-Liniger/'$correlator'/T_'$kBT'/c_'$c'/k_fixed/k_'${(l:2::0:)nk}'kFo4/sr_'$target_sumrule'/store/data'
 	cd $dir
-	echo $dir
-	mkdir -p plots/
-	LiebLin_Catalogue_Fixed_c_k_Nscaling_Smoothen_DSF $whichDSF $c $nk $kBT $target_sumrule $ommin $ommax $Nom $width
-	mv *dsfs plots/
-	mv K_* plots/
-	mv Omega_* plots/
+	for datadir in *
+	do
+	    cd $datadir
+	    N=${datadir#"N_"}
+	    iK=$(($nk * $N/8))
+	    Smoothen_LiebLin_DSF_Scaled $whichDSF $c $N $N $iK $iK $kBT 0 $ommin $ommax $Nom $width
+	    cd ..
+	done
 	cd $basedir
-	echo ' Successfully computed DSFs for c =' $c', kfact = '$nk'\n' | tee -a $logfile
+	echo ' Successfully computed DSFs for c =' $c', kfact = '$nk'\n'
     done
 done

scripts/build_LiebLin_catalogue_k_fixed_dsfs_plots.sh

@@ -32,6 +32,13 @@ kBT=$2
 target_sumrule=$3
 width=$4
 
+correlator='rho-rho'
+if [[ $whichDSF == 'o' ]]; then
+    correlator='psidag-psi'
+elif [[ $whichDSF == 'g' ]]; then
+    correlator='psi-psidag'
+fi
+
 clist=(1024 512 256 128 64 32 16 8 4 2 1 0.5 0.25 0.125 0.0625 0.03125 0.015625)
 
 basedir="$(pwd)"
@@ -41,9 +48,14 @@ for c in $clist
 do
     for nk in {1..16}
     do
-	echo 'Starting plotting of DSFs for c =' $c', kfact = '$nk | tee -a $logfile
-	dir='c_'$c'/kBT_'$kBT'/k_fixed/k_'${(l:2::0:)nk}'kFo4/sr_'$target_sumrule'/plots'
+	echo 'Starting plotting of DSFs for c =' $c', kfact = '$nk
+	dir='Lieb-Liniger/'$correlator'/T_'$kBT'/c_'$c'/k_fixed/k_'${(l:2::0:)nk}'kFo4/sr_'$target_sumrule'/store/plots'
+	mkdir -p $dir
 	cd $dir
+	# Move all K_, Omega_ and .dsfs files to the plots directory
+	mv ../data/*/K_* .
+	mv ../data/*/Omega_* .
+	mv ../data/*/*dsfs .
 	dirlist="$(ls)"
 	# Find the Omega file
 	for file in *
@@ -54,16 +66,14 @@ do
 	done
 	echo 'Omega file: ' $omegafile
 	# For each .dsfs file, plot
-	for file in *
+	for file in *.dsfs
 	do
-	    if [[ $file = LiebLin*dsfs ]]; then
-		echo 'Found file ' $file
-		# invoke the python script
-		plot_dsf_k_fixed.py $omegafile $file
-	    fi
+	    echo 'Found file ' $file
+	    # invoke the python script
+	    plot_dsf_k_fixed.py $omegafile $file
 	done
 
 	cd $basedir
-	echo ' Successfully plotted DSFs for c =' $c', kfact = '$nk'\n' | tee -a $logfile
+	echo ' Successfully plotted DSFs for c =' $c', kfact = '$nk'\n'
     done
 done

scripts/plot_dsf_k_fixed.py

@@ -23,11 +23,11 @@ plt.ylabel('$S (k, \omega)$')
 
 elements = dsffile.split('_')
 
-c_int = elements[4]
-L = elements[6]
-N = elements[8]
-iK = elements[13]
-width = elements[23].partition('.')[0]
+c_int = elements[3]
+L = elements[5]
+N = elements[7]
+iK = elements[12]
+width = elements[20].partition('.')[0]
 
 rho = int(N)/int(L)
 kokF = int(iK)*0.5/int(L)