diff --git a/f500/collecting/F500.py b/f500/collecting/F500.py index 044e401b8f23e20b6a0012329649a16bac53e8a1..af734325eefe3c01baf55dbd8c79233931dcdb03 100644 --- a/f500/collecting/F500.py +++ b/f500/collecting/F500.py @@ -148,7 +148,7 @@ class F500: self.investigation.plots = set() #store metadata file 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...) @@ -541,11 +541,9 @@ class F500: self.logger.info("histogram: {}".format(df.filename)) histogramFile = self.args.investigationPath + "/" + com.value try: - if len(histogramList) == 0: - skiprows = None - else: - skiprows = 1 - histogramData = pandas.read_csv(histogramFile, sep=";", header=0, skiprows=1) + histogramData = pandas.read_csv(histogramFile, sep=";") + if len(histogramList) > 0: + histogramData = histogramData[histogramData["sample"] != "edges"] histogramList.append(histogramData) except Exception as e: self.logger.warning("Could not process histogram file: {}".format(e))