Skip to content
Snippets Groups Projects
Commit 7b360d53 authored by Sven Warris's avatar Sven Warris
Browse files

Combine histograms

parent d0727cf5
Branches
No related tags found
No related merge requests found
...@@ -148,7 +148,7 @@ class F500: ...@@ -148,7 +148,7 @@ class F500:
self.investigation.plots = set() self.investigation.plots = set()
#store metadata file #store metadata file
os.makedirs("/".join([self.investigationPath, self.investigation.title]), exist_ok=True) os.makedirs("/".join([self.investigationPath, self.investigation.title]), exist_ok=True)
self.metadata.to_csv("/".join([self.investigationPath, self.investigation.title, os.path.basename(self.datamatrix_file)]), sep=";") self.metadata.to_csv("/".join([self.investigationPath, self.investigation.title, os.path.basename(self.datamatrix_file)]), sep=";", index=False)
# Create study, title comes datamatrix file (ID...) # Create study, title comes datamatrix file (ID...)
...@@ -541,11 +541,9 @@ class F500: ...@@ -541,11 +541,9 @@ class F500:
self.logger.info("histogram: {}".format(df.filename)) self.logger.info("histogram: {}".format(df.filename))
histogramFile = self.args.investigationPath + "/" + com.value histogramFile = self.args.investigationPath + "/" + com.value
try: try:
if len(histogramList) == 0: histogramData = pandas.read_csv(histogramFile, sep=";")
skiprows = None if len(histogramList) > 0:
else: histogramData = histogramData[histogramData["sample"] != "edges"]
skiprows = 1
histogramData = pandas.read_csv(histogramFile, sep=";", header=0, skiprows=1)
histogramList.append(histogramData) histogramList.append(histogramData)
except Exception as e: except Exception as e:
self.logger.warning("Could not process histogram file: {}".format(e)) self.logger.warning("Could not process histogram file: {}".format(e))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment