diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py
index 2ccad6638e021595b57cff3337116848ca662329..1e866866da36d8a21ce1380b07c77f1262f9f712 100755
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py
@@ -59,7 +59,7 @@ def getDsFileName(file,input=False):
             ds=file.split('#')[0]
             name=file.split('#')[1]
         else:
-            if file.find('/') is not -1:
+            if file.find('/')!=-1:
                 fileparts=file.split('/')
                 ds=fileparts[len(fileparts)-1]
             else:
@@ -380,7 +380,7 @@ class SCTCalibExecutor( athenaExecutor ):
             self.conf.addToArgdict('EventNumber', trfArgClasses.argInt(0))
 
         # Set STAGE_SVCCLASS
-        if not SvcClass is '' and not SvcClass is None:
+        if not SvcClass == '' and not SvcClass == None:
             os.environ['STAGE_SVCCLASS']=SvcClass
 
         # Check input type
@@ -408,7 +408,7 @@ class SCTCalibExecutor( athenaExecutor ):
         # set job number
         jobnb=''
         # find seperator for jobnumber
-        if prefix is not '' : 
+        if prefix != '' : 
             sep=prefix.find('._')
             if ( sep != -1 ) :
                 jobnb=prefix[sep+1:]
@@ -456,7 +456,7 @@ class SCTCalibExecutor( athenaExecutor ):
             self._trf.generateReport(fast=True)
             sys.exit(0)
 
-        if jobnb is not '':
+        if jobnb != '':
             self.conf.addToArgdict('JobNumber', trfArgClasses.argString(jobnb))
 
         # get RunNumber from datasetName
@@ -571,7 +571,7 @@ class SCTCalibExecutor( athenaExecutor ):
         
         super(SCTCalibExecutor, self).execute()
 
-        if self._rc is not 0:
+        if self._rc != 0:
             try:
 
                 if 'less than the required minimum number of events' in open('log.sctcalib').read():
@@ -731,11 +731,11 @@ class SCTCalibExecutor( athenaExecutor ):
         else:
             jobnb=''
 
-        if prefix is not '':
+        if prefix != '':
             try:
                 if runArgs['splitHitMap']._value !=1:
                     os.rename('mycool.db',prefix+'.mycool.db')                
-                if jobnb is not '':
+                if jobnb != '':
                     prefixTmp = prefix + "."+ jobnb
                 else :
                     prefixTmp = prefix
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py
index f2c0cd207b6226d4d271926bbaae47499a2b2e86..0f5b6f8cbd9c7a4b62911ea0ac762f4b0807656d 100755
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py
@@ -37,9 +37,10 @@ ReadBS         = True
 # - Set only one flag to True and others to False
 #------------------------------------------------------------
 #--- Algs using TrkVal or BS
-DoHitMap         = True
+DoHitMaps        = False
 DoHitMapsLB      = False 
 DoHV             = False
+DoNoisyStrip     = True
 DoDeadStrip      = False
 DoDeadChip       = False
 DoQuietStrip     = False
@@ -60,7 +61,6 @@ UseConfiguration = True
 UseCalibration   = True 
 UseMajority      = True 
 UseBSError       = False
-DoHitMaps        = True 
 ReadHitMaps      = True # True = 2 steps of HitMap production and analysis, False = simultaneous production and analysis
 DoBSErrors       = False
 
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
index f5cade09cb6c33352745ddd16ea2c8b6a70b2302..222bfdeee5ed2841dbb327f86da127abbbe3063e 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
@@ -101,6 +101,11 @@ if hasattr( runArgs, 'splitHitMap' ) :
       ReadHitMaps = True
       if EvtMax != 1 :
         print("WARNING! EvtMax is not 1, although HitMap analysis is run!")
+else :
+      DoHitMapsLB = False
+      DoHitMaps   = False
+      ReadHitMaps = False
+    
 
 #--- Setting which algorithms to be run
 if hasattr( runArgs, 'part' ) :
@@ -255,6 +260,7 @@ if DoDeadStrip or DoDeadChip :
 #--- set flag for creating hitmaps
 if DoHV or DoHIST :
     DoHitMaps = False
+    DoHitMapsLB = False
 #--- set flag for creating BSErrors map
 if DoDeadStrip or DoDeadChip :
     DoBSErrors = True