Skip to content
This repository has been archived by the owner on Jan 31, 2022. It is now read-only.

Refactoring of anaUltraScurve.py and additional output distributions #75

Merged
merged 42 commits into from
Mar 28, 2018
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6fc0c32
added getMapping function for creating chan-strip-panpin look up table
Mar 22, 2018
3f590af
removed unnecessary imports and made use of getMapping()
Mar 22, 2018
e34b1c7
added function for creating empty lists to be more pythonic
Mar 22, 2018
71b670c
cleaned up duplication in histogram initialization
Mar 22, 2018
af3af2f
getMapping() will now also include the vfat channel number as a ident…
Mar 22, 2018
5d948cd
removed unnecessary duplication of code when filling summary histograms
Mar 22, 2018
9338611
added additional method to ScanDataFitter to allow a histogram to be …
Mar 22, 2018
05bb749
Nev is now a nesteddict in ScanDataFitter and will be applied per vfa…
Mar 22, 2018
a3bdf37
functionality added to ScanDataFitter to provide output in either cha…
Mar 22, 2018
6d43ec9
cleaned up hot channel determination and made output table compatible…
Mar 22, 2018
b5e2cc9
ScanDataFitter.scanFits renamed to scanFitResults to distinguish it m…
Mar 22, 2018
1dc921d
removed unnecessary duplicate containers
Mar 22, 2018
66e9e39
ScanDataFitter.calDAC2Q_m and ScanDataFitter.calDAC2Q_b are now corre…
Mar 22, 2018
43b7f09
migrated dict_calSF to anaInfo since multiple objects require it
Mar 22, 2018
4724d92
moved fill2DScurveSummaryPlots() to anaUltraScurve.py and moved def o…
Mar 22, 2018
d3c6326
fixed a syntax error when checking for current pulse mode in ScanData…
Mar 22, 2018
74203b5
the saveSummary() has been moved from anaUltraScurve.py into anautili…
Mar 22, 2018
5d38901
cleaning up saving output plots
Mar 22, 2018
b470b2e
additional 1D histograms are made showing scurve mean and width posit…
Mar 22, 2018
7f3b1ff
added graphical 1D distributions of histograms and fits
Mar 22, 2018
77c5a6f
syntax and bug fixes, moved TTree declaration to block of code where …
Mar 22, 2018
c663b1a
changed drawing performed by plotAllSCurvesOnCanvas()
Mar 22, 2018
c603ba2
saveSummary will now take draw option as an argument
Mar 22, 2018
2f92ae4
tweaking thresh and enc distribution binning
Mar 22, 2018
50c53d9
adding vfatList argument which defaults to VFAT0..23 inclusive
Mar 23, 2018
3e3dd94
undoing vfatList option, more thought is required
Mar 23, 2018
3309d97
color coding TF1's in fitting based on fit results
Mar 23, 2018
594f741
fixed an issue where fitting scurves would use negative initial param…
Mar 23, 2018
c41ca6a
new utility function for list like object index finding
Mar 23, 2018
a83fcc9
added the possibility of debug printing to ScanDataFitter
Mar 23, 2018
e2c946c
filling histograms is now done via SetBinContent method so the error …
Mar 23, 2018
b3e478e
moved around where chargeBin list was determined to increase algorith…
Mar 23, 2018
5078e55
updated TObject and output names to be less ambigious, e.g. instead o…
Mar 23, 2018
93e86bf
added axis labels to thr and enc distributions
Mar 23, 2018
7c9215f
Added a threshold and enc distribution which summarizes the entire de…
Mar 26, 2018
def8374
typos fixed and added summary output directory
Mar 26, 2018
f558ada
merged with develop
Mar 26, 2018
b477934
mak3x8Canvas can now accept a TCanvas object to plot additional distr…
Mar 26, 2018
d053fb9
changing names of TObjects for scurve sigma to be consistent
Mar 26, 2018
f3a92c2
removing commented lines
Mar 26, 2018
174d8f9
decreasing bin size of scurve mean and sigma dist's for full detector
Mar 26, 2018
7f1a0e4
Merge branch 'develop' into feature_refactoringSCurve
Mar 26, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ScanDataFitter.calDAC2Q_m and ScanDataFitter.calDAC2Q_b are now corre…
…ctly initialized to numpy arrays
  • Loading branch information
Brian Dorney committed Mar 22, 2018
commit 66e9e39d59bbe1125a3039d0818f0828a18d1bf3
4 changes: 2 additions & 2 deletions fitting/fitScanData.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ def __init__(self, calDAC2Q_m=None, calDAC2Q_b=None, isVFAT3=False, isIPulse=Fal
self.isIPulse = isIPulse
self.dict_calSF = dict((calSF, 0.25*calSF+0.25) for calSF in range(0,4))

self.calDAC2Q_m = [1.]*24
self.calDAC2Q_m = np.ones(24)
if calDAC2Q_m is not None:
self.calDAC2Q_m = calDAC2Q_m

self.calDAC2Q_b = [0.]*24
self.calDAC2Q_b = np.zeros(24)
if calDAC2Q_b is not None:
self.calDAC2Q_b = calDAC2Q_b

Expand Down