Skip to content

Commit

Permalink
Re #10159. Fixing python whitespace issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Aug 25, 2014
1 parent 26c54dc commit e49ad7d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Expand Up @@ -43,7 +43,7 @@ def CalibrateWish( run_per_panel_list):

for (run_number, panel_name) in run_per_panel_list:
panel_name = str(panel_name)
run_number = str(run_number)
run_number = str(run_number)
# load your data and integrate it
ws = LoadRaw(run_number, OutputWorkspace=panel_name)
ws = Integration(ws, 1, 20000, OutputWorkspace=panel_name)
Expand All @@ -58,7 +58,7 @@ def CalibrateWish( run_per_panel_list):

# update kwargs
kwargs['calibTable'] = calibrationTable # append calib to calibrationtable
kwargs['rangeList'] = high_range # calibrate only the upper tubes
kwargs['rangeList'] = high_range # calibrate only the upper tubes

calibrationTable = tube.calibrate(ws, tube_set, upper_tube, funcForm, **kwargs)
kwargs['calibTable'] = calibrationTable
Expand All @@ -67,7 +67,7 @@ def CalibrateWish( run_per_panel_list):

# copy data from the current panel to the whole_instrument
for i in range(tube_set.getNumTubes()):
for spec_num in tube_set.getTube(i):
for spec_num in tube_set.getTube(i):
whole_instrument.setY(spec_num,ws.dataY(spec_num))

# calibrate the whole_instrument with the last calibrated panel which has the calibration accumulation
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/scripts/Calibration/tube_calib.py
Expand Up @@ -409,13 +409,13 @@ def getCalibratedPixelPositions( ws, tubePts, idealTubePts, whichTube, peakTestM
for i in range(nDets):
deti = ws.getDetector( whichTube[i])
det_pos = deti.getPos()
pNew = pixels[i]
pNew = pixels[i]
# again, the opeartion float * v3d is not defined, but v3d * float is,
# so, I wrote the new pos as center + unit_vector * (float)
newPos = center + unit_vector * pNew

detIDs.append( deti.getID() )
detPositions.append( newPos )
detIDs.append( deti.getID() )
detPositions.append( newPos )
# print i, detIDs[i], detPositions[i]

return detIDs, detPositions
Expand Down

0 comments on commit e49ad7d

Please sign in to comment.