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
peterfpeterson committed Aug 22, 2014
1 parent 82393f7 commit 4008508
Showing 1 changed file with 59 additions and 59 deletions.
118 changes: 59 additions & 59 deletions Code/Mantid/scripts/Calibration/tube_spec.py
View file
Expand Up @@ -154,7 +154,7 @@ def getComponent ( self ):
"""
Returns instrument component corresponding to specification
:rtype: instrument component
:rtype: instrument component
"""
if( self.componentArray != []):
return self.componentArray[0]
Expand All @@ -164,17 +164,17 @@ def getComponent ( self ):

comp = self.inst.getComponentByName(self.componentNameArray[0])

if( comp ):
self.componentArray.append(comp)
if( comp ):
self.componentArray.append(comp)

return self.componentArray[0]
return self.componentArray[0]


def getComponents ( self ):
"""
Returns instrument components corresponding to specification
:rtype: array of instrument components
:rtype: array of instrument components
"""
if( self.componentArray != []):
return self.componentArray
Expand All @@ -185,15 +185,15 @@ def getComponents ( self ):

comp = self.inst.getComponentByName(self.componentNameArray[i])

if( comp ):
if( comp ):
self.componentArray.append(comp)
else:
else:
print "Did not find", self.componentNameArray[i]
print "Tube specification not valid"
self.componentArray = []
return []

return self.componentArray
return self.componentArray

def getDetectorInfoFromTube( self, tubeIx ):
"""
Expand All @@ -210,33 +210,33 @@ def getDetectorInfoFromTube( self, tubeIx ):
:param tubeIx: index of Tube in specified set
:rtype: ID of first detector, number of detectors and step between detectors +1 or -1
:rtype: ID of first detector, number of detectors and step between detectors +1 or -1
"""
nTubes = self.getNumTubes()
if(nTubes < 0):
print "Error in listing tubes"
return 0, 0, 1
if(tubeIx < 0 or tubeIx >= nTubes):
print "Tube index",tubeIx,"out of range 0 to",nTubes
return 0, 0, 1
nTubes = self.getNumTubes()
if(nTubes < 0):
print "Error in listing tubes"
return 0, 0, 1
if(tubeIx < 0 or tubeIx >= nTubes):
print "Tube index",tubeIx,"out of range 0 to",nTubes
return 0, 0, 1

comp = self.tubes[tubeIx]
comp = self.tubes[tubeIx]

if(comp != 0):
if(comp != 0):
firstDet = comp[0].getID()
numDet = comp.nelements()
# Allow for reverse numbering of Detectors
lastDet = comp[numDet-1].getID()
if (lastDet < firstDet):
step = -1
if( firstDet - lastDet + 1 != numDet):
print "Detector number range",firstDet-lastDet+1," not equal to number of detectors",numDet
print "Detectors not numbered continuously in this tube. Calibration will fail for this tube."
else:
step = 1
if( lastDet - firstDet + 1 != numDet):
print "Detector number range",lastDet-firstDet+1," not equal to number of detectors",numDet
print "Detectors not numbered continuously in this tube. Calibration will fail for this tube."
numDet = comp.nelements()
# Allow for reverse numbering of Detectors
lastDet = comp[numDet-1].getID()
if (lastDet < firstDet):
step = -1
if( firstDet - lastDet + 1 != numDet):
print "Detector number range",firstDet-lastDet+1," not equal to number of detectors",numDet
print "Detectors not numbered continuously in this tube. Calibration will fail for this tube."
else:
step = 1
if( lastDet - firstDet + 1 != numDet):
print "Detector number range",lastDet-firstDet+1," not equal to number of detectors",numDet
print "Detectors not numbered continuously in this tube. Calibration will fail for this tube."

#print "First dectector ", firstDet," Last detector ", firstDet+numDet-1, "Number of detectors ", numDet
#print "First dectector ", firstDet," Last detector ", comp[numDet-1].getID()
Expand All @@ -252,22 +252,22 @@ def getTubeLength( self, tubeIx ):
:param tubeIx: index of Tube in specified set
:rtype: Length of tube (first pixel to last pixel) in metres. 0.0 if tube not found.
:rtype: Length of tube (first pixel to last pixel) in metres. 0.0 if tube not found.
"""
nTubes = self.getNumTubes()
if(nTubes < 0):
print "Error in listing tubes"
return 0.0
if(tubeIx < 0 or tubeIx >= nTubes):
print "Tube index",tubeIx,"out of range 0 to",nTubes
return 0.0
nTubes = self.getNumTubes()
if(nTubes < 0):
print "Error in listing tubes"
return 0.0
if(tubeIx < 0 or tubeIx >= nTubes):
print "Tube index",tubeIx,"out of range 0 to",nTubes
return 0.0

comp = self.tubes[tubeIx]
comp = self.tubes[tubeIx]

if(comp != 0):
if(comp != 0):
firstDet = comp[0].getID()
numDet = comp.nelements()
numDet = comp.nelements()
return comp[0].getDistance( comp[numDet-1] )
else:
print self.componentNameArray[0], tubeIx, "not found"
Expand All @@ -282,20 +282,20 @@ def getTubeName ( self, tubeIx ):
:param tubeIx: index of Tube in specified set
:rtype: Name of tube as in IDF or 'unknown' if not found.
:rtype: Name of tube as in IDF or 'unknown' if not found.
"""
nTubes = self.getNumTubes()
if(nTubes < 0):
print "Error in listing tubes"
return 'Unknown'
if(tubeIx < 0 or tubeIx >= nTubes):
print "Tube index",tubeIx,"out of range 0 to",nTubes
return 'Unknown'

comp = self.tubes[tubeIx]

if(comp != 0):
return comp.getFullName()
nTubes = self.getNumTubes()
if(nTubes < 0):
print "Error in listing tubes"
return 'Unknown'
if(tubeIx < 0 or tubeIx >= nTubes):
print "Tube index",tubeIx,"out of range 0 to",nTubes
return 'Unknown'

comp = self.tubes[tubeIx]

if(comp != 0):
return comp.getFullName()
else:
print self.componentNameArray[0], tubeIx, "not found"
return "Unknown"
Expand Down Expand Up @@ -360,13 +360,13 @@ def getTube(self, tubeIx):
:param tubeIx: index of Tube in specified set
:rtype: list of indices
:rtype: list of indices
"""
nTubes = self.getNumTubes()
if( (0 <= tubeIx) & (tubeIx < nTubes) ):
return self.getTubeByString(tubeIx)
else:
print "Tube", tubeIx, "out of range 0 to",self.numTubes,"."
return self.getTubeByString(tubeIx)
else:
print "Tube", tubeIx, "out of range 0 to",self.numTubes,"."



0 comments on commit 4008508

Please sign in to comment.