Commit 89501586 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

activate script fixed 

Thanks to Olaf for catching the bug

Also minor addition to drspine.py Python script
parent dee142a7

Makefile.version

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ export PROJECT=drspine 


export VERSION_MAJOR=1

export VERSION_MINOR=4

export VERSION_RELEASE=0.rc3

export VERSION_RELEASE=0.rc4



export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)

python/drspine/drspine.py

+3 −3
Original line number Diff line number Diff line
@@ -271,16 +271,16 @@ def _load_sqt_bin(filename, full_bw=False): 
    return s[s[:,0]>0]      # all but full band width (TOF slices)





def plot_sqt_bin(filename, save=False, full_bw=False):

def plot_sqt_bin(filename, save=False, full_bw=False, fmt=None, label=None):

    """

    Plot Q,tau binning

    """



    if full_bw:

        d = _load_sqt_bin(filename, True)

        plt.plot(d[:,3], d[:,4],   'ro', label='Full BW')

        plt.plot(d[:,3], d[:,4],   fmt or 'ro', label=label or 'Full BW')

    d = _load_sqt_bin(filename, False)

    plt.plot(d[:,3], d[:,4],   'k.', label='TOF slices')

    plt.plot(d[:,3], d[:,4],   fmt or 'k.', label=label or 'TOF slices')



    plt.xscale('log')

    plt.grid(True, which='both')

scripts/drspine_activate.sh

+7 −3
Original line number Diff line number Diff line 
#!/bin/bash



basedir=$(dirname $0)

#basedir=$(dirname $0)

basedir=$(dirname ${BASH_SOURCE}{:-$0})

nsetopdir=$(cd $basedir/..; pwd)



case "$-" in
@@ -11,7 +12,10 @@ case "$-" in 
    export PYTHONPATH PATH

    #

    $nsetopdir/bin/drspine_create_env.sh

	# this works only on Linux

	if [ ! -z $(which xdg-mime) ]; then

		xdg-mime default evince.desktop application/pdf

	fi

    #

    echo

    echo
@@ -19,7 +23,7 @@ case "$-" in 
    echo " *** NSE reduction/analysis environment is set        *** "

    echo " *** $nsetopdir "

    echo

    echo " For help contact dasneutron@gmail.com "

    echo " For help, contact dasneutron@gmail.com "

    echo "--------------------------------------------------------------"

    if [ ! -z "$1" ]; then

        mkdir -p ipts-$1