Skip to content
This repository has been archived by the owner on Nov 5, 2020. It is now read-only.

Commit

Permalink
Set histrogram kde as default (close #133)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Mar 16, 2017
1 parent 4bbd5b5 commit cc4b785
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
@@ -1,7 +1,8 @@
0.7.2
- Set histrogram-base KDE as default (#133)
- Regression analysis:
- Added generalizes linear mixed effects model (#126)
- Remember treatment and repetition for each measurement
- Remember treatment and repetition for each measurement (#134)
- Bugfixes:
- Same default location for find/add measurements dialogs (#139)
0.7.1
Expand Down
87 changes: 43 additions & 44 deletions config/dclab.cfg
@@ -1,57 +1,56 @@
# This is a dclab configuration file. It is loaded upon initialization
# of librtdc or dclab. Any parameters in the [sections] can be
# overwritten by "para" or "camera" files for separate measurements.

[Filtering]
Enable Filters = True
# Automatically set data event limit to common minimum,
# such that all data sets have same number of points.
Limit Events Auto = False
limit events = 2000
# This file contains default measurement and data analysis parameters
# for ShapaOut. This is not a full list of all possible parameters.

[analysis]
regression model = lmm # [lmm, glmm]
regression treatment = None
regression repetition = 1


[Plotting]
# plot isomechs
Isoelastics = True
Rows = 2
Columns = 3
Axis X = Area
Axis Y = Defo
Scatter Marker Size = 2
Scatter Title Colored = True
Scatter Plot Excluded Events = True
[filtering]
enable filters = True
# "limit events" can be used to force a certain number of events for all
# RT-DC data sets.
limit events = 2000
# "limit events auto" sets the number of events to the maximum possible value
limit events auto = False


[plotting]
isoelastics = True
rows = 2
columns = 3
axis x = Area
axis y = Defo
scatter marker size = 2
scatter title colored = True
scatter plot excluded events = True
# Limit number of points drawn in a scatter plot
# Active or inactive
Downsampling = True
# Set maximum number. If <1, only grid-downsampling is performed
Downsample Events = 2000
# (not to be confused with "limit events" in [filtering]
downsampling = True
# Set maximum number. If <1, only approximate grid-downsampling is performed
downsample events = 2000
# Axes scaling
Scale X = Linear
Scale Y = Linear
scale x = Linear # [Log, Linear]
scale y = Linear # [Log, Linear]

# Contour resolution
Contour Fix Scale = False
Contour Plot = False
Contour Width = 2.3
Contour Color = black
contour fix scale = False
contour plot = False
contour width = 2.3
contour color = black

# Kernel density estimators
KDE = None # Kernel Density Estimate, can also be "Multivariate"
kde = histogram # Kernel Density Estimator [gauss, histogram, multivariate, none]

# Legend plot
Legend Plot = True
Legend Autoscaled = True
legend plot = True
legend autoscaled = True

# standard variables that are sensible
Defo Max = 0.2
Circ Min = 0.8
Circ Max = 1

Show Events = True


[Analysis]
Regression Model = lmm #lmm or glmm
Regression Treatment = None
Regression Repetition = 1
defo max = 0.2
circ min = 0.8
circ max = 1

# Display number of events in corner of plot
show events = True

0 comments on commit cc4b785

Please sign in to comment.