diff --git a/.travis.yml b/.travis.yml index da80a0a..e96947c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: before_install: - sudo apt-get install -y python3-pip - pip3 install pyflakes - - cd ./software/DataAcquisitionFromDevice + - cd ./software/DataAcquisition script: - pyflakes *.py diff --git a/software/DataAcquisition/boxplot.R b/software/DataAcquisition/boxplot.R new file mode 100644 index 0000000..438cc0d --- /dev/null +++ b/software/DataAcquisition/boxplot.R @@ -0,0 +1,44 @@ +inputFileName ="DataNoSample.csv" +fileNoSample <- read.delim(inputFileName, , sep=",") + +inputFileName ="DataAmSample1.csv" +fileAmSample1 <- read.delim(inputFileName, , sep=",") + +inputFileName ="DataRaSample2.csv" +fileAmSample2 <- read.delim(inputFileName, , sep=",") + + +backgroundLevel = fileNoSample$Counter +AmIsotope = fileAmSample1$Counter +RaIsotope = fileAmSample2$Counter + + +# date column should be type of date, not string, so parse it +png(filename = paste0("results-", format(Sys.time(), "%d_%b_%Y_%H_%M"), ".png"), width = 800, height = 900, bg = "white") + + + +verticalLabels <- c("background level\nradiation", "Am isotope\n(somke detector)", "Ra isotope\n(old compass)") + +boxplot(backgroundLevel, AmIsotope, RaIsotope, +col="grey", +names=verticalLabels, +horizontal = FALSE, +main = "Radioactivity of different samples meassured using Ionization Chamber", +xlab = "Measurement", +ylab = "Sensor voltage", +boxwex=0.2) + +# no X grid, Y grid grid aligns with the tick marks +grid(NA, NULL) + + +boxplot(backgroundLevel, AmIsotope, RaIsotope, +col="grey", +names=verticalLabels, +horizontal = FALSE, +main = "Radioactivity of different samples meassured using Ionization Chamber", +xlab = "Measurement", +ylab = "Sensor voltage", +boxwex=0.2, +add=T) diff --git a/software/DataAcquisitionFromDevice/config.py b/software/DataAcquisition/config.py similarity index 100% rename from software/DataAcquisitionFromDevice/config.py rename to software/DataAcquisition/config.py diff --git a/software/DataAcquisitionFromDMM/main.py b/software/DataAcquisition/dmm.py similarity index 100% rename from software/DataAcquisitionFromDMM/main.py rename to software/DataAcquisition/dmm.py diff --git a/software/DataAcquisitionFromDevice/drawDiagramSingle.R b/software/DataAcquisition/drawDiagramSingle.R similarity index 100% rename from software/DataAcquisitionFromDevice/drawDiagramSingle.R rename to software/DataAcquisition/drawDiagramSingle.R diff --git a/software/DataAcquisitionFromDevice/main.R b/software/DataAcquisition/main.R similarity index 100% rename from software/DataAcquisitionFromDevice/main.R rename to software/DataAcquisition/main.R diff --git a/software/DataAcquisitionFromDevice/main.py b/software/DataAcquisition/main.py similarity index 100% rename from software/DataAcquisitionFromDevice/main.py rename to software/DataAcquisition/main.py diff --git a/software/DataAcquisitionFromDevice/mcp3425.py b/software/DataAcquisition/mcp3425.py similarity index 100% rename from software/DataAcquisitionFromDevice/mcp3425.py rename to software/DataAcquisition/mcp3425.py diff --git a/software/DataAcquisitionFromDMM/.idea/acquisitiondmm.iml b/software/DataAcquisitionFromDMM/.idea/acquisitiondmm.iml deleted file mode 100644 index 7223334..0000000 --- a/software/DataAcquisitionFromDMM/.idea/acquisitiondmm.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/software/DataAcquisitionFromDMM/DataParser.R b/software/DataAcquisitionFromDMM/DataParser.R deleted file mode 100644 index f408585..0000000 --- a/software/DataAcquisitionFromDMM/DataParser.R +++ /dev/null @@ -1,43 +0,0 @@ -library(latticeExtra) -require(gridExtra) -require(grid) - -# set error messages test to english -Sys.setenv(LANG = "en") - -#load samples -samples <- read.delim("SampleOutputFile.csv", , sep=",") - -# date column should be type of date, not string, so parse it -# sample row: 2018-09-28 11:51:08.340037 -samples$Timestamp = as.POSIXct(samples$Timestamp, format="%Y-%m-%d %H:%M:%S.%OS") - -# create representation of a picture -png(filename = "results.png", width = 800, height = 900, bg = "white") - -# create graphs -plotValueVsTime <- xyplot(Measurement ~ Timestamp, - samples, - type = "l", - grid = TRUE, - col.line = "black", - ylab = "V DC", - xlim=c(min(samples$Timestamp), max(samples$Timestamp)), - main = "Change over time") - -plotHistogram <- histogram(samples$Measurement, - color = "white", - col = "grey", - xlab = "V DC", - ylab = "percentage", - main = "Histogram") - -# show graphs -grid.arrange(plotValueVsTime, plotHistogram, nrow = 2) - -# add timestamp -trellis.focus("toplevel") -pictureCreationTimestamp <- as.POSIXlt(Sys.time()) -panel.text(0.85, 0.03, pictureCreationTimestamp, cex = 1.2, font = 2) -trellis.unfocus() -