Skip to content

Commit

Permalink
all: fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
sbinet committed May 22, 2020
1 parent 98694bc commit 56834a4
Show file tree
Hide file tree
Showing 158 changed files with 1,677 additions and 1,540 deletions.
69 changes: 69 additions & 0 deletions brio/cmd/brio-gen/internal/briotest/briotest.go
Expand Up @@ -39,9 +39,78 @@ type Hist struct {
myu16 U16
}

func NewHist(
name string, dataX float64,
i int,
u uint,

i8 int8,
i16 int16,
i32 int32,
i64 int64,
u8 uint8,
u16 uint16,
u32 uint32,
u64 uint64,

f32 float32,
f64 float64,

c64 complex64,
c128 complex128,

b bool,

arrI8 [2]int8,
sliF64 []float64,
bins []Bin,
sliPs []*Bin,

ptr *float64,
myu8 U8,
myu16 U16,
) *Hist {
return &Hist{
Name: name,
Data: struct {
X float64
}{X: dataX},
i: i,
u: u,

i8: i8,
i16: i16,
i32: i32,
i64: i64,
u8: u8,
u16: u16,
u32: u32,
u64: u64,

f32: f32,
f64: f64,

c64: c64,
c128: c128,

b: b,

arrI8: arrI8,
sliF64: sliF64,
bins: bins,
sliPs: sliPs,

ptr: ptr,
myu8: myu8,
myu16: myu16,
}
}

type Bin struct {
x, y float64
}

func NewBin(x, y float64) *Bin { return &Bin{x: x, y: y} }

type U8 uint8
type U16 uint16
1 change: 1 addition & 0 deletions brio/cmd/brio-gen/internal/gen/gen.go
Expand Up @@ -302,6 +302,7 @@ func (o *%[1]s) UnmarshalBinary(data []byte) (err error) {
g.genUnmarshalType(ft.Type(), "o."+ft.Name())
}

g.printf("_ = data\n")
g.printf("return err\n}\n\n")
}

Expand Down
Expand Up @@ -298,6 +298,7 @@ func (o *T1) UnmarshalBinary(data []byte) (err error) {
data = data[8:]
o.myU16 = U16(binary.LittleEndian.Uint16(data[:2]))
data = data[2:]
_ = data
return err
}

Expand All @@ -313,6 +314,7 @@ func (o *T2) MarshalBinary() (data []byte, err error) {
func (o *T2) UnmarshalBinary(data []byte) (err error) {
o.ID = int64(binary.LittleEndian.Uint64(data[:8]))
data = data[8:]
_ = data
return err
}

Expand Down Expand Up @@ -342,5 +344,6 @@ func (o *T3) UnmarshalBinary(data []byte) (err error) {
}
data = data[n:]
}
_ = data
return err
}
2 changes: 2 additions & 0 deletions brio/cmd/brio-gen/testdata/briotest_brio.go
Expand Up @@ -213,6 +213,7 @@ func (o *Hist) UnmarshalBinary(data []byte) (err error) {
data = data[1:]
o.myu16 = U16(binary.LittleEndian.Uint16(data[:2]))
data = data[2:]
_ = data
return err
}

Expand All @@ -232,5 +233,6 @@ func (o *Bin) UnmarshalBinary(data []byte) (err error) {
data = data[8:]
o.y = float64(math.Float64frombits(binary.LittleEndian.Uint64(data[:8])))
data = data[8:]
_ = data
return err
}
1 change: 1 addition & 0 deletions brio/cmd/brio-gen/testdata/image_brio.go
Expand Up @@ -22,5 +22,6 @@ func (o *Point) UnmarshalBinary(data []byte) (err error) {
data = data[8:]
o.Y = int(binary.LittleEndian.Uint64(data[:8]))
data = data[8:]
_ = data
return err
}
10 changes: 8 additions & 2 deletions cmd/lhef2hepmc/main.go
Expand Up @@ -100,7 +100,10 @@ func main() {
evt.LengthUnit = hepmc.MM

weight := lhevt.XWGTUP
evt.Weights.Add("0", weight)
err = evt.Weights.Add("0", weight)
if err != nil {
log.Fatalf("could not add weights: %+v", err)
}

xsecval := -1.0
xsecerr := -1.0
Expand Down Expand Up @@ -169,7 +172,7 @@ func main() {
continue
}
nmax += 1
vtx.AddParticleOut(&hepmc.Particle{
err = vtx.AddParticleOut(&hepmc.Particle{
Momentum: fmom.NewPxPyPzE(
lhevt.PUP[i][0],
lhevt.PUP[i][1],
Expand All @@ -181,6 +184,9 @@ func main() {
Status: 1,
Barcode: 3 + i,
})
if err != nil {
log.Fatalf("could not add out-particle: %+v", err)
}
}
err = evt.AddVertex(&vtx)
if err != nil {
Expand Down
38 changes: 19 additions & 19 deletions fads/calo.go
Expand Up @@ -16,11 +16,6 @@ import (
"gonum.org/v1/gonum/stat/distuv"
)

type etaphiBin struct {
eta float64
phi float64
}

type EtaPhiBin struct {
EtaBins []float64
PhiBins []float64
Expand Down Expand Up @@ -160,9 +155,9 @@ type Calorimeter struct {
efrac map[int]EneFrac
bins EtaPhiGrid

etaphibins []EtaPhiBin
ecalres func(eta, ene float64) float64
hcalres func(eta, ene float64) float64
//etaphibins []EtaPhiBin
ecalres func(eta, ene float64) float64
hcalres func(eta, ene float64) float64

particles string
tracks string
Expand Down Expand Up @@ -399,10 +394,11 @@ func (tsk *Calorimeter) Process(ctx fwk.Context) error {
},
}

calotrk := caloTrack{}

var tower Candidate
twrtrks := make([]Candidate, 0, len(tracks))
var (
calotrk = caloTrack{}
tower Candidate
//twrtrks = make([]Candidate, 0, len(tracks)) // FIXME(sbinet)
)

for _, hit := range hits[towerid] {
flags := (hit >> 24) & 0x00000000000000FF
Expand All @@ -412,21 +408,25 @@ func (tsk *Calorimeter) Process(ctx fwk.Context) error {
switch {
case (flags & 1) != 0: // track hits
calotower.TrackHits++
track := &tracks[n]
ene := track.Mom.E()
t := track.Pos.T()
var (
track = &tracks[n]
ene = track.Mom.E()
t = track.Pos.T()
)
calotrk.ECal.Add(ene*trkecal[n], t)
calotrk.HCal.Add(ene*trkhcal[n], t)
twrtrks = append(twrtrks, *track)
//twrtrks = append(twrtrks, *track) // FIXME(sbinet)

default:
if (flags & 2) != 0 { // photon hits
calotower.PhotonHits++
}

part := &parts[n]
ene := part.Mom.E()
t := part.Pos.T()
var (
part = &parts[n]
ene = part.Mom.E()
t = part.Pos.T()
)
calotower.ECal.Add(ene*twrecal[n], t)
calotower.HCal.Add(ene*twrhcal[n], t)
tower.Add(part)
Expand Down
5 changes: 4 additions & 1 deletion fads/cmd/fads-app/main.go
Expand Up @@ -100,7 +100,10 @@ options:
panic(err)
}
defer f.Close()
pprof.StartCPUProfile(f)
err = pprof.StartCPUProfile(f)
if err != nil {
log.Fatalf("could not start CPU profile: %+v", err)
}
defer pprof.StopCPUProfile()
}

Expand Down
6 changes: 5 additions & 1 deletion fads/cmd/fads-rivet-mc-generic/main.go
Expand Up @@ -34,6 +34,7 @@ package main
import (
"flag"
"fmt"
"log"
"os"
"reflect"
"runtime/pprof"
Expand Down Expand Up @@ -82,7 +83,10 @@ options:
panic(err)
}
defer f.Close()
pprof.StartCPUProfile(f)
err = pprof.StartCPUProfile(f)
if err != nil {
log.Fatalf("could not start CPU profile: %+v", err)
}
defer pprof.StopCPUProfile()
}

Expand Down
37 changes: 15 additions & 22 deletions fads/cmd/fads-rivet-mc-generic/mcalg.go
Expand Up @@ -60,19 +60,14 @@ type McGeneric struct {
}

func (tsk *McGeneric) Configure(ctx fwk.Context) error {
var err error

err = tsk.DeclInPort(tsk.mcevt, reflect.TypeOf(hepmc.Event{}))
err := tsk.DeclInPort(tsk.mcevt, reflect.TypeOf(hepmc.Event{}))
if err != nil {
return err
}

return err
return nil
}

func (tsk *McGeneric) StartTask(ctx fwk.Context) error {
var err error

svc, err := ctx.Svc("histsvc")
if err != nil {
return err
Expand Down Expand Up @@ -139,11 +134,10 @@ func (tsk *McGeneric) StartTask(ctx fwk.Context) error {
tsk.hetaChPMRatio = bookS2D("EtaChPMRatio")
tsk.hrapChPMRatio = bookS2D("RapidityChPMRatio")

return err
return nil
}

func (tsk *McGeneric) StopTask(ctx fwk.Context) error {
var err error
for _, h := range []*hbook.H1D{
tsk.hmult.Hist, tsk.heta.Hist, tsk.hrap.Hist, tsk.hpt.Hist, tsk.hene.Hist, tsk.hphi.Hist,
tsk.hmultCh.Hist, tsk.hetaCh.Hist, tsk.hrapCh.Hist, tsk.hptCh.Hist, tsk.heneCh.Hist, tsk.hphiCh.Hist,
Expand All @@ -169,13 +163,14 @@ func (tsk *McGeneric) StopTask(ctx fwk.Context) error {
}
v.res.Fill(res.Points()...)
}
return err
return nil
}

func (tsk *McGeneric) Process(ctx fwk.Context) error {
var err error
store := ctx.Store()
msg := ctx.Msg()
var (
store = ctx.Store()
msg = ctx.Msg()
)

v, err := store.Get(tsk.mcevt)
if err != nil {
Expand Down Expand Up @@ -214,10 +209,10 @@ func (tsk *McGeneric) Process(ctx fwk.Context) error {
mc.M1 = 1
mc.Pos = fmom.PxPyPzE(vtx.Position)
}
pdgcode := p.PdgID
if pdgcode < 0 {
pdgcode = -pdgcode
}
// pdgcode := p.PdgID
// if pdgcode < 0 {
// pdgcode = -pdgcode
// }

if p.Status != 1 {
continue
Expand Down Expand Up @@ -300,12 +295,10 @@ func (tsk *McGeneric) Process(ctx fwk.Context) error {

tsk.hsvc.FillH1D(tsk.hmultCh.ID, float64(ncfsparts), weight)
msg.Debugf("total charged multiplicity = %d\n", ncfsparts)
return err
return nil
}

func newMcGeneric(typ, name string, mgr fwk.App) (fwk.Component, error) {
var err error

tsk := &McGeneric{
TaskBase: fwk.NewTask(typ, name, mgr),
mcevt: "/fads/McEvent",
Expand All @@ -314,7 +307,7 @@ func newMcGeneric(typ, name string, mgr fwk.App) (fwk.Component, error) {
hstream: "/MC_GENERIC",
}

err = tsk.DeclProp("Input", &tsk.mcevt)
err := tsk.DeclProp("Input", &tsk.mcevt)
if err != nil {
return nil, err
}
Expand All @@ -334,7 +327,7 @@ func newMcGeneric(typ, name string, mgr fwk.App) (fwk.Component, error) {
return nil, err
}

return tsk, err
return tsk, nil
}

func init() {
Expand Down

0 comments on commit 56834a4

Please sign in to comment.