-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
- Loading branch information
There are no files selected for viewing
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1 @@ | ||
<<<<<<< HEAD | ||
{"tables": [{"header": ["no Metadata", "", "different column separators"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "AsciiReader", "uploaded": "2024-07-08T10:31:35.914861"}} | ||
======= | ||
{"tables": [{"header": ["no Metadata", "", "different column separators"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "AsciiReader", "uploaded": "2024-07-09T08:08:05.544532"}} | ||
>>>>>>> 111-transmission-error-of-certain-data-types-from-chemotion | ||
{"tables": [{"header": ["no Metadata", "", "different column separators"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "AsciiReader", "uploaded": "2024-07-09T08:12:44.287922"}} |
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1 @@ | ||
<<<<<<< HEAD | ||
{"tables": [{"header": ["not recommended, because metadata will be lost!"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "CSVReader", "uploaded": "2024-07-08T10:31:37.228832", "lineterminator": "\\r\\n", "quoting": "0", "doublequote": "False", "delimiter": "comma", "quotechar": "\"", "skipinitialspace": "True"}} | ||
======= | ||
{"tables": [{"header": ["not recommended, because metadata will be lost!"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "CSVReader", "uploaded": "2024-07-09T08:08:06.878551", "lineterminator": "\\r\\n", "quoting": "0", "doublequote": "False", "delimiter": "comma", "quotechar": "\"", "skipinitialspace": "True"}} | ||
>>>>>>> 111-transmission-error-of-certain-data-types-from-chemotion | ||
{"tables": [{"header": ["not recommended, because metadata will be lost!"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "CSVReader", "uploaded": "2024-07-09T08:12:45.941713", "lineterminator": "\\r\\n", "quoting": "0", "doublequote": "False", "delimiter": "comma", "quotechar": "\"", "skipinitialspace": "True"}} |
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1 @@ | ||
<<<<<<< HEAD | ||
{"tables": [{"header": ["Binary file"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "AsciiReader", "uploaded": "2024-07-08T10:31:46.865990"}} | ||
======= | ||
{"tables": [{"header": ["Binary file"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "AsciiReader", "uploaded": "2024-07-09T08:08:17.624306"}} | ||
>>>>>>> 111-transmission-error-of-certain-data-types-from-chemotion | ||
{"tables": [{"header": ["Binary file"], "metadata": {"rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "Readme.md", "content_type": "", "mime_type": "text/plain", "extension": ".md", "reader": "AsciiReader", "uploaded": "2024-07-09T08:12:57.841044"}} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1 @@ | ||
<<<<<<< HEAD | ||
{"tables": [{"header": ["Erzeugt mit NETZSCH Proteus Software", "Projekt : Proben-ID : Datum/Zeit : Labor : Operator :", "SB 175-5 31.03.2022 12:47:59", "Probe : Referenz : Material : Korr./Temp.kal : Empf.Datei :", "SB 175-5, 6.4 mg -----,0 mg", "-- / 14-03-2022 09:47 14-03-2022 09:47", "Bereich : Probentr./TC : Modus /Messtyp. : Segmente : Tiegel :", "-80\u00b0C/10.0(K/min)/200\u00b0C DSC 214 Corona sensor / E DSC / Probe 4/4 Concavus Al, pierced lid", "Atmosph\u00e4re : Korr./Bereich :", "N2, 40.0ml/min / N2, 60.0ml/min 0:0:0/5000 \u00b5V", "Ger\u00e4t : NETZSCH DSC 214 Datei : C:\\NETZSCH\\Proteus80\\data\\Sergej\\SB 175-5.ngb-sdg Methode : Sergej -80bis200", "-80 -60 -40 -20 0 20 40 60 80", "Temperatur /\u00b0C", "0", "50", "100", "150", "200", "250", "Gasdurchfluss /(ml/min)", "-0.1", "0.0", "0.1", "0.2", "0.3", "0.4", "DSC /(mW/mg)", "Hauptansicht 2022-03-31 14:04 Nutzer: Poly", "Peak: 34.7 \u00b0C", "-33.2 \u00b0C", "0.219 J/(g*K)", "Glas\u00fcbergang: Mittl: Delta-Cp*:", "[1.4]", "[1.4]", "[1.4]", "\u2193 Exo"], "metadata": {"___SECTION": "_", "Projekt :": "Proben-ID : Datum/Zeit : Labor : Operator :", "SB 175-5": "31.03.2022 12:47:59", "Probe :": "Referenz : Material : Korr./Temp.kal : Empf.Datei :", "SB 175-5, 6.4 mg": "-----,0 mg", "-- / 14-03-2022 09:47": "14-03-2022 09:47", "Bereich :": "Probentr./TC : Modus /Messtyp. : Segmente : Tiegel :", "-80\u00b0C/10.0(K/min)/200\u00b0C": "DSC 214 Corona sensor / E DSC / Probe 4/4 Concavus Al, pierced lid", "Atmosph\u00e4re :": "Korr./Bereich :", "N2, 40.0ml/min / N2, 60.0ml/min": "0:0:0/5000 \u00b5V", "-80": "-60 -40 -20 0 20 40 60 80", "Glas\u00fcbergang: ": "Mittl: Delta-Cp*:", "rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "SB 175-5-4.pdf", "content_type": "", "mime_type": "application/pdf", "extension": ".pdf", "reader": "PdfReader", "uploaded": "2024-07-08T10:31:46.931776"}} | ||
======= | ||
{"tables": [{"header": ["Erzeugt mit NETZSCH Proteus Software", "Projekt : Proben-ID : Datum/Zeit : Labor : Operator :", "SB 175-5 31.03.2022 12:47:59", "Probe : Referenz : Material : Korr./Temp.kal : Empf.Datei :", "SB 175-5, 6.4 mg -----,0 mg", "-- / 14-03-2022 09:47 14-03-2022 09:47", "Bereich : Probentr./TC : Modus /Messtyp. : Segmente : Tiegel :", "-80\u00b0C/10.0(K/min)/200\u00b0C DSC 214 Corona sensor / E DSC / Probe 4/4 Concavus Al, pierced lid", "Atmosph\u00e4re : Korr./Bereich :", "N2, 40.0ml/min / N2, 60.0ml/min 0:0:0/5000 \u00b5V", "Ger\u00e4t : NETZSCH DSC 214 Datei : C:\\NETZSCH\\Proteus80\\data\\Sergej\\SB 175-5.ngb-sdg Methode : Sergej -80bis200", "-80 -60 -40 -20 0 20 40 60 80", "Temperatur /\u00b0C", "0", "50", "100", "150", "200", "250", "Gasdurchfluss /(ml/min)", "-0.1", "0.0", "0.1", "0.2", "0.3", "0.4", "DSC /(mW/mg)", "Hauptansicht 2022-03-31 14:04 Nutzer: Poly", "Peak: 34.7 \u00b0C", "-33.2 \u00b0C", "0.219 J/(g*K)", "Glas\u00fcbergang: Mittl: Delta-Cp*:", "[1.4]", "[1.4]", "[1.4]", "\u2193 Exo"], "metadata": {"___SECTION": "_", "Projekt :": "Proben-ID : Datum/Zeit : Labor : Operator :", "SB 175-5": "31.03.2022 12:47:59", "Probe :": "Referenz : Material : Korr./Temp.kal : Empf.Datei :", "SB 175-5, 6.4 mg": "-----,0 mg", "-- / 14-03-2022 09:47": "14-03-2022 09:47", "Bereich :": "Probentr./TC : Modus /Messtyp. : Segmente : Tiegel :", "-80\u00b0C/10.0(K/min)/200\u00b0C": "DSC 214 Corona sensor / E DSC / Probe 4/4 Concavus Al, pierced lid", "Atmosph\u00e4re :": "Korr./Bereich :", "N2, 40.0ml/min / N2, 60.0ml/min": "0:0:0/5000 \u00b5V", "-80": "-60 -40 -20 0 20 40 60 80", "Glas\u00fcbergang: ": "Mittl: Delta-Cp*:", "rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "SB 175-5-4.pdf", "content_type": "", "mime_type": "application/pdf", "extension": ".pdf", "reader": "PdfReader", "uploaded": "2024-07-09T08:08:17.689513"}} | ||
>>>>>>> 111-transmission-error-of-certain-data-types-from-chemotion | ||
{"tables": [{"header": ["Erzeugt mit NETZSCH Proteus Software", "Projekt : Proben-ID : Datum/Zeit : Labor : Operator :", "SB 175-5 31.03.2022 12:47:59", "Probe : Referenz : Material : Korr./Temp.kal : Empf.Datei :", "SB 175-5, 6.4 mg -----,0 mg", "-- / 14-03-2022 09:47 14-03-2022 09:47", "Bereich : Probentr./TC : Modus /Messtyp. : Segmente : Tiegel :", "-80\u00b0C/10.0(K/min)/200\u00b0C DSC 214 Corona sensor / E DSC / Probe 4/4 Concavus Al, pierced lid", "Atmosph\u00e4re : Korr./Bereich :", "N2, 40.0ml/min / N2, 60.0ml/min 0:0:0/5000 \u00b5V", "Ger\u00e4t : NETZSCH DSC 214 Datei : C:\\NETZSCH\\Proteus80\\data\\Sergej\\SB 175-5.ngb-sdg Methode : Sergej -80bis200", "-80 -60 -40 -20 0 20 40 60 80", "Temperatur /\u00b0C", "0", "50", "100", "150", "200", "250", "Gasdurchfluss /(ml/min)", "-0.1", "0.0", "0.1", "0.2", "0.3", "0.4", "DSC /(mW/mg)", "Hauptansicht 2022-03-31 14:04 Nutzer: Poly", "Peak: 34.7 \u00b0C", "-33.2 \u00b0C", "0.219 J/(g*K)", "Glas\u00fcbergang: Mittl: Delta-Cp*:", "[1.4]", "[1.4]", "[1.4]", "\u2193 Exo"], "metadata": {"___SECTION": "_", "Projekt :": "Proben-ID : Datum/Zeit : Labor : Operator :", "SB 175-5": "31.03.2022 12:47:59", "Probe :": "Referenz : Material : Korr./Temp.kal : Empf.Datei :", "SB 175-5, 6.4 mg": "-----,0 mg", "-- / 14-03-2022 09:47": "14-03-2022 09:47", "Bereich :": "Probentr./TC : Modus /Messtyp. : Segmente : Tiegel :", "-80\u00b0C/10.0(K/min)/200\u00b0C": "DSC 214 Corona sensor / E DSC / Probe 4/4 Concavus Al, pierced lid", "Atmosph\u00e4re :": "Korr./Bereich :", "N2, 40.0ml/min / N2, 60.0ml/min": "0:0:0/5000 \u00b5V", "-80": "-60 -40 -20 0 20 40 60 80", "Glas\u00fcbergang: ": "Mittl: Delta-Cp*:", "rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "SB 175-5-4.pdf", "content_type": "", "mime_type": "application/pdf", "extension": ".pdf", "reader": "PdfReader", "uploaded": "2024-07-09T08:12:57.941206"}} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1 @@ | ||
<<<<<<< HEAD | ||
{"tables": [{"header": ["Created with NETZSCH Proteus software", "Project : Identity : Date/time : Laboratory : Operator :", "SCH 20.09.2022 12:44:19", "Sample : Reference : Material : Corr./temp.cal : Sens.file :", "SCH-179, 5.21 mg -----,0 mg", "-- / 02-09-2022 07:23 01-09-2022 19:10", "Range : Sample car./TC : Mode/type of meas. : Segments : Crucible :", "-50\u00b0C/10.0(K/min)/100\u00b0C DSC 214 Corona sensor / E DSC / Sample 3/3 Concavus Al, pierced lid", "Atmosphere : Corr/m. range :", "N2, 40.0ml/min / N2, 60.0ml/min 0:0:0/5000 \u00b5V", "Instrument : NETZSCH DSC 214 File : C:\\NETZSCH\\Proteus80\\data\\Sven\\SCH-179\\SCH-179.ngb-sdg Method : SCH-mPEG", "-40 -20 0 20 40 60 80 100", "Temperature /\u00b0C", "0", "50", "100", "150", "200", "250", "Flow /(ml/min)", "-6", "-4", "-2", "0", "2", "4", "DSC /(mW/mg)", "0", "20", "40", "60", "80", "100", "Integral /%", "Main 2022-09-22 13:25 User: Poly SCH-179-3.ngb-odg", "Peak: 53.0 \u00b0C; -4.806 mW/mg", "Area: -152.4 J/g", "[1.3]", "[1.3]", "[1.3]", "[1.3]", "\u2191 exo"], "metadata": {"___SECTION": "_", "Project :": "Identity : Date/time : Laboratory : Operator :", "SCH": "20.09.2022 12:44:19", "Sample :": "Reference : Material : Corr./temp.cal : Sens.file :", "SCH-179, 5.21 mg": "-----,0 mg", "-- / 02-09-2022 07:23": "01-09-2022 19:10", "Range :": "Sample car./TC : Mode/type of meas. : Segments : Crucible :", "-50\u00b0C/10.0(K/min)/100\u00b0C": "DSC 214 Corona sensor / E DSC / Sample 3/3 Concavus Al, pierced lid", "Atmosphere :": "Corr/m. range :", "N2, 40.0ml/min / N2, 60.0ml/min": "0:0:0/5000 \u00b5V", "-40": "-20 0 20 40 60 80 100", "Main 2022-09-22 13:25 User: Poly": "SCH-179-3.ngb-odg", "rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "SCH-179-3.pdf", "content_type": "", "mime_type": "application/pdf", "extension": ".pdf", "reader": "PdfReader", "uploaded": "2024-07-08T10:31:46.916274"}} | ||
======= | ||
{"tables": [{"header": ["Created with NETZSCH Proteus software", "Project : Identity : Date/time : Laboratory : Operator :", "SCH 20.09.2022 12:44:19", "Sample : Reference : Material : Corr./temp.cal : Sens.file :", "SCH-179, 5.21 mg -----,0 mg", "-- / 02-09-2022 07:23 01-09-2022 19:10", "Range : Sample car./TC : Mode/type of meas. : Segments : Crucible :", "-50\u00b0C/10.0(K/min)/100\u00b0C DSC 214 Corona sensor / E DSC / Sample 3/3 Concavus Al, pierced lid", "Atmosphere : Corr/m. range :", "N2, 40.0ml/min / N2, 60.0ml/min 0:0:0/5000 \u00b5V", "Instrument : NETZSCH DSC 214 File : C:\\NETZSCH\\Proteus80\\data\\Sven\\SCH-179\\SCH-179.ngb-sdg Method : SCH-mPEG", "-40 -20 0 20 40 60 80 100", "Temperature /\u00b0C", "0", "50", "100", "150", "200", "250", "Flow /(ml/min)", "-6", "-4", "-2", "0", "2", "4", "DSC /(mW/mg)", "0", "20", "40", "60", "80", "100", "Integral /%", "Main 2022-09-22 13:25 User: Poly SCH-179-3.ngb-odg", "Peak: 53.0 \u00b0C; -4.806 mW/mg", "Area: -152.4 J/g", "[1.3]", "[1.3]", "[1.3]", "[1.3]", "\u2191 exo"], "metadata": {"___SECTION": "_", "Project :": "Identity : Date/time : Laboratory : Operator :", "SCH": "20.09.2022 12:44:19", "Sample :": "Reference : Material : Corr./temp.cal : Sens.file :", "SCH-179, 5.21 mg": "-----,0 mg", "-- / 02-09-2022 07:23": "01-09-2022 19:10", "Range :": "Sample car./TC : Mode/type of meas. : Segments : Crucible :", "-50\u00b0C/10.0(K/min)/100\u00b0C": "DSC 214 Corona sensor / E DSC / Sample 3/3 Concavus Al, pierced lid", "Atmosphere :": "Corr/m. range :", "N2, 40.0ml/min / N2, 60.0ml/min": "0:0:0/5000 \u00b5V", "-40": "-20 0 20 40 60 80 100", "Main 2022-09-22 13:25 User: Poly": "SCH-179-3.ngb-odg", "rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "SCH-179-3.pdf", "content_type": "", "mime_type": "application/pdf", "extension": ".pdf", "reader": "PdfReader", "uploaded": "2024-07-09T08:08:17.674641"}} | ||
>>>>>>> 111-transmission-error-of-certain-data-types-from-chemotion | ||
{"tables": [{"header": ["Created with NETZSCH Proteus software", "Project : Identity : Date/time : Laboratory : Operator :", "SCH 20.09.2022 12:44:19", "Sample : Reference : Material : Corr./temp.cal : Sens.file :", "SCH-179, 5.21 mg -----,0 mg", "-- / 02-09-2022 07:23 01-09-2022 19:10", "Range : Sample car./TC : Mode/type of meas. : Segments : Crucible :", "-50\u00b0C/10.0(K/min)/100\u00b0C DSC 214 Corona sensor / E DSC / Sample 3/3 Concavus Al, pierced lid", "Atmosphere : Corr/m. range :", "N2, 40.0ml/min / N2, 60.0ml/min 0:0:0/5000 \u00b5V", "Instrument : NETZSCH DSC 214 File : C:\\NETZSCH\\Proteus80\\data\\Sven\\SCH-179\\SCH-179.ngb-sdg Method : SCH-mPEG", "-40 -20 0 20 40 60 80 100", "Temperature /\u00b0C", "0", "50", "100", "150", "200", "250", "Flow /(ml/min)", "-6", "-4", "-2", "0", "2", "4", "DSC /(mW/mg)", "0", "20", "40", "60", "80", "100", "Integral /%", "Main 2022-09-22 13:25 User: Poly SCH-179-3.ngb-odg", "Peak: 53.0 \u00b0C; -4.806 mW/mg", "Area: -152.4 J/g", "[1.3]", "[1.3]", "[1.3]", "[1.3]", "\u2191 exo"], "metadata": {"___SECTION": "_", "Project :": "Identity : Date/time : Laboratory : Operator :", "SCH": "20.09.2022 12:44:19", "Sample :": "Reference : Material : Corr./temp.cal : Sens.file :", "SCH-179, 5.21 mg": "-----,0 mg", "-- / 02-09-2022 07:23": "01-09-2022 19:10", "Range :": "Sample car./TC : Mode/type of meas. : Segments : Crucible :", "-50\u00b0C/10.0(K/min)/100\u00b0C": "DSC 214 Corona sensor / E DSC / Sample 3/3 Concavus Al, pierced lid", "Atmosphere :": "Corr/m. range :", "N2, 40.0ml/min / N2, 60.0ml/min": "0:0:0/5000 \u00b5V", "-40": "-20 0 20 40 60 80 100", "Main 2022-09-22 13:25 User: Poly": "SCH-179-3.ngb-odg", "rows": "0", "columns": "0"}, "columns": [], "rows": []}], "metadata": {"file_name": "SCH-179-3.pdf", "content_type": "", "mime_type": "application/pdf", "extension": ".pdf", "reader": "PdfReader", "uploaded": "2024-07-09T08:12:57.916148"}} |
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.