Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: artlbv/HexaBoardAnalyzer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CMS-HGCAL/HexaBoardAnalyzer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 12, 2017

  1. rm scipy import; add dacinj variable in tree

    RPi-B27 authored and RPi-B27 committed Dec 12, 2017
    Copy the full SHA
    c55cb75 View commit details

  2. make points visible by default

    RPi-B27 authored and RPi-B27 committed Dec 12, 2017
    Copy the full SHA
    43a4a92 View commit details
Showing with 12 additions and 3 deletions.
  1. +2 −2 plotNoise.py
  2. +10 −1 readHexConvData.py
4 changes: 2 additions & 2 deletions plotNoise.py
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
import glob, sys, os, array, math
import numpy as np
import ROOT as rt
from scipy.stats import norm
from scipy import signal
#from scipy.stats import norm
#from scipy import signal

#rt.TGaxis.SetMaxDigits(3)

11 changes: 10 additions & 1 deletion readHexConvData.py
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,8 @@ def createTree(fname):

fout = rt.TFile( foutname, 'recreate' )
tree = rt.TTree( 'sk2cms', 'sk2cms tree' )

tree.SetMarkerStyle(20)

# variables for tree
event_b = np.array( [ 0 ] , dtype=int)
chip_b = np.array( [ 0 ] , dtype=int)
@@ -64,6 +65,8 @@ def createTree(fname):
roll_b = array('i', nsca * [ 0 ])
ts_b = array('i', nsca * [ 0 ])

dacinj_b = np.array( [ 0 ] , dtype=int)

# charges
hgain_b = array('i', nchips * nsca * nchans * [ -99 ])
lgain_b = array('i', nchips * nsca * nchans * [ -99 ])
@@ -79,6 +82,7 @@ def createTree(fname):
tree.Branch( 'event', event_b, 'event/I' )
tree.Branch( 'chip', chip_b, 'chip/I' )
tree.Branch( 'roll', roll_b, 'roll[13]/I' )
tree.Branch( 'dacinj', dacinj_b, 'dacinj/I' )
tree.Branch( 'timesamp', ts_b, 'timesamp[13]/I' )
tree.Branch( 'hg', hgain_b, 'hg[' + str(nchips) + '][13][64]/I' )
tree.Branch( 'lg', lgain_b, 'lg[' + str(nchips) + '][13][64]/I' )
@@ -130,6 +134,10 @@ def createTree(fname):
print("Stopping!")
break

#Save DAC value for injected charge
dacinj = int(header_items[7],16)


if chip > 3: continue
'''
if chip > 0:
@@ -142,6 +150,7 @@ def createTree(fname):
chip_b[0] = chip
for i in range(nsca): roll_b[i] = roll[i]
#print roll, roll_b
dacinj_b[0] = dacinj

# time pos
timepos = getTimePos(roll)