Fixing another lint problem

This commit is contained in:
rasmusvt 2022-04-08 14:47:35 +02:00
parent 67ba03dc0c
commit 4b74ea4592

View file

@ -2,9 +2,9 @@ import pandas as pd
import numpy as np import numpy as np
import os import os
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import beamtime.auxillary as aux import nafuma.auxillary as aux
import beamtime.xanes as xas import nafuma.xanes as xas
import beamtime.xanes.io as io import nafuma.xanes.io as io
def rbkerbest(): def rbkerbest():
print("ROSENBORG!<3") print("ROSENBORG!<3")
@ -24,7 +24,6 @@ def finding_edge(df):
edge='Ni' edge='Ni'
return(edge) return(edge)
<<<<<<< HEAD:beamtime/xanes/calib.py
#def pre_edge_subtraction(df,filenames, options={}): #def pre_edge_subtraction(df,filenames, options={}):
def test(innmat): def test(innmat):
df_test= xas.io.put_in_dataframe(innmat) df_test= xas.io.put_in_dataframe(innmat)
@ -41,11 +40,6 @@ def pre_edge_subtraction(path, options={}):
filenames = xas.io.get_filenames(path) filenames = xas.io.get_filenames(path)
df= xas.io.put_in_dataframe(path) df= xas.io.put_in_dataframe(path)
edge=finding_edge(df) edge=finding_edge(df)
=======
def split_xanes_scan(filename, destination=None, replace=False):
#root is the path to the beamtime-folder
#destination should be the path to the processed data
>>>>>>> master:nafuma/xanes/calib.py
#Defining the end of the region used to define the background, thus start of the edge #Defining the end of the region used to define the background, thus start of the edge
#implement widget #implement widget