Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all plane-related codes w/ SST #552

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion macro/flux_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def main():
pid = hit.PdgCode()
assert pid not in [12, -12, 14, -14, 16, -16]
detector_ID = hit.GetDetectorID()
station = detector_ID // 10000000
station = detector_ID // 1000000
h['T{}_all'.format(station)].Fill(x, y, weight)
if abs(pid) == 13:
muon = True
Expand Down
11 changes: 5 additions & 6 deletions muonShieldOptimization/ana_ShipMuon.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,16 +446,15 @@ def makeProd():
os.chdir('../'+prefix+str(i+1))

def strawEncoding(detid):
# statnb*10000000+vnb*1000000+pnb*100000+lnb*10000+1000+snb
# vnb=view number; pnb=plane number; lnb=layer number; snb=straw number
# statnb*1000000+vnb*100000+lnb*10000+1000+snb
# vnb=view number; lnb=layer number; snb=straw number
# statnb = station number. 1,2,3,4 tracking stations, 5 veto station
vnb = ROOT.Long()
pnb = ROOT.Long()
lnb = ROOT.Long()
snb = ROOT.Long()
statnb = ROOT.Long()
modules['Strawtubes'].StrawDecode(detid,statnb,vnb,pnb,lnb,snb)
return [statnb,vnb,pnb,lnb,snb]
modules['Strawtubes'].StrawDecode(detid,statnb,vnb,lnb,snb)
return [statnb,vnb,lnb,snb]

def detMap():
sGeo = ROOT.gGeoManager
Expand Down Expand Up @@ -658,7 +657,7 @@ def executeOneFile(fn,output=None,pid=None):
detID = ahit.GetDetectorID()
if ahit.GetName() == 'strawtubesPoint':
tmp = strawEncoding(detID)
# detName = str(tmp[0]*10000000+tmp[1]*1000000+tmp[2]*100000+tmp[3]*10000)
# detName = str(tmp[0]*1000000+tmp[1]*100000+tmp[2]*10000)
detName = "strawstation_"+str(tmp[0])
x = ahit.GetX()
y = ahit.GetY()
Expand Down
1 change: 0 additions & 1 deletion passive/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ ShipGeoCave.cxx
ShipMagnet.cxx
ShipChamber.cxx
ShipTargetStation.cxx
MufluxTargetStation.cxx
ShipMuonShield.cxx
ShipPassiveContFact.cxx
ShipTAUMagneticSpectrometer.cxx
Expand Down
289 changes: 0 additions & 289 deletions passive/MufluxTargetStation.cxx

This file was deleted.

Loading