ADD GRADING ON ABSOLUTE IV(150) VALUE TO -20 (same criteria as +17)

piberger · piberger · commit a21f01c377a3 · 2015-10-14T15:39:53.000+02:00
diff --git a/Analyse/Changelog/MoReWeb_changes.html b/Analyse/Changelog/MoReWeb_changes.html
@@ -7,7 +7,10 @@
 
 	<body>
 	<h1>MoReWeb changelog</h1>
-	last updated: October 12, 2015
+	last updated: October 14, 2015
+
+	<h2>v0.6.7</h2>
+	IV grading: also grade on measured value of leakage current at -20 degrees with the same criteria than at +17. <strong>This will affect grading of modules that have both a higher leakage current at -20 than at +17 and a leakage current at -20 larger than 10 uA.</strong>
 
 	<h2>v0.6.6</h2>
 	add possibility to place a file containing the grade into each fulltest/x-ray hr subfolder to manually change grade. (comments can be placed in the main folder in a file called comments.txt)<br />
diff --git a/Analyse/MoReWeb.html b/Analyse/MoReWeb.html
@@ -7,8 +7,8 @@
 
 	<body>
 
-	<h1>MoReWeb v0.6.6</h1>
-	last updated: October 12, 2015
+	<h1>MoReWeb v0.6.7</h1>
+	last updated: October 14, 2015
 	<h2>Changelog</h2>
 	<a href='Changelog/MoReWeb_changes.html'>see Changelog</a>
 
diff --git a/Analyse/OverviewClasses/CMSPixel/ProductionOverview/ProductionOverviewPage/ModuleFailuresOverview/ModuleFailuresOverview.py b/Analyse/OverviewClasses/CMSPixel/ProductionOverview/ProductionOverviewPage/ModuleFailuresOverview/ModuleFailuresOverview.py
@@ -112,16 +112,15 @@ def GenerateOverview(self):
                     if RowTuple['TestType'] in FullTests:
                         TestIndex = FullTests.index(RowTuple['TestType'])
 
-                        if not RowTuple['Temperature'] or (len(RowTuple['Temperature'].strip()) > 0 and int(RowTuple['Temperature']) == 17):
-                            #  grading criteria for measured currents
-                            GradeAB = float(self.TestResultEnvironmentObject.GradingParameters['currentB'])
-                            GradeBC = float(self.TestResultEnvironmentObject.GradingParameters['currentC'])
-
-                            Value = self.GetJSONValue([ RowTuple['RelativeModuleFinalResultsPath'], RowTuple['FulltestSubfolder'], 'Summary3', 'KeyValueDictPairs.json', 'CurrentAtVoltage150V', 'Value'])
-                            if Value is not None and float(Value) > GradeBC:
-                                Summary.SetBinContent(BinNumber, 1 + 3*YLabels.index('IV150') + TestIndex, ColorC)
-                            elif Value is not None and float(Value) > GradeAB:
-                                Summary.SetBinContent(BinNumber, 1 + 3*YLabels.index('IV150') + TestIndex, ColorB)
+                        #  grading criteria for measured currents
+                        GradeAB = float(self.TestResultEnvironmentObject.GradingParameters['currentB'])
+                        GradeBC = float(self.TestResultEnvironmentObject.GradingParameters['currentC'])
+
+                        Value = self.GetJSONValue([ RowTuple['RelativeModuleFinalResultsPath'], RowTuple['FulltestSubfolder'], 'Summary3', 'KeyValueDictPairs.json', 'CurrentAtVoltage150V', 'Value'])
+                        if Value is not None and float(Value) > GradeBC:
+                            Summary.SetBinContent(BinNumber, 1 + 3*YLabels.index('IV150') + TestIndex, ColorC)
+                        elif Value is not None and float(Value) > GradeAB:
+                            Summary.SetBinContent(BinNumber, 1 + 3*YLabels.index('IV150') + TestIndex, ColorB)
 
                     if RowTuple['TestType'] in FullTests:
                         TestIndex = FullTests.index(RowTuple['TestType'])
diff --git a/Analyse/TestResultClasses/CMSPixel/QualificationGroup/Fulltest/Grading/Grading.py b/Analyse/TestResultClasses/CMSPixel/QualificationGroup/Fulltest/Grading/Grading.py
@@ -92,12 +92,11 @@ def PopulateResultData(self):
             CurrentVariation = float(IVTestResult.ResultData['KeyValueDictPairs']['Variation']['Value'])
 
             # current
-            #    grading is only done with the measured value at +17
-            if self.ParentObject.Attributes['TestType'].startswith('p17_'):
-                if IVGrade == 1 and CurrentAtVoltage150V > self.TestResultEnvironmentObject.GradingParameters['currentB']:
-                    IVGrade = 2
-                if CurrentAtVoltage150V > self.TestResultEnvironmentObject.GradingParameters['currentC']:
-                    IVGrade = 3
+            #    grading is done with the measured value at +17 and -20
+            if IVGrade == 1 and CurrentAtVoltage150V > self.TestResultEnvironmentObject.GradingParameters['currentB']:
+                IVGrade = 2
+            if CurrentAtVoltage150V > self.TestResultEnvironmentObject.GradingParameters['currentC']:
+                IVGrade = 3
 
             # slope
             #    grading is only done with the measured value at +17
