| @@ -607,12 +607,7 @@ |
| and displaySummary[key]["J Flag"] > 0 |
| ): |
| # check chronic sample size |
| - if displaySummary[key]["n-chronic"] not in [ |
| - "NA", |
| - "N/A", |
| - "No amm. Data", |
| - 0, |
| - ]: |
| + if displaySummary[key]["n-chronic"] not in ["NA","N/A","No amm. Data",0]: |
| maxJ_chronic = float(displaySummary[key]["n-chronic"]) * float( |
| displaySummary[key]["Summary Stat."] |
| ) |
| @@ -3020,12 +3015,8 @@ |
| displaySummary["Cd-D"]["Summary Stat."] = 0.85 # DisMat(13, 14) = 0.85 |
| displaySummary["Cd-T"]["Summary Stat."] = 0.5 # DisMat(13, 15) = 0.5 |
| displaySummary["Chloride-T"]["Summary Stat."] = 0.85 # DisMat(13, 16) = 0.5 |
| - displaySummary["Chlorine-T"][ |
| - "Summary Stat." |
| - ] = 0.85 # DisMat(13, 17) = 0.85 #chlorine |
| - displaySummary["Chlor-A"][ |
| - "Summary Stat." |
| - ] = 0.85 # DisMat(13, 18) = 0.85 #chlor A |
| + displaySummary["Chlorine-T"]["Summary Stat."] = 0.85 # DisMat(13, 17) = 0.85 #chlorine |
| + displaySummary["Chlor-A"]["Summary Stat."] = 0.85 # DisMat(13, 18) = 0.85 #chlor A |
| displaySummary["Cr3-D"]["Summary Stat."] = 0.85 # DisMat(13, 19) = 0.85 |
| displaySummary["Cr3-T"]["Summary Stat."] = 0.5 # DisMat(13, 20) = 0.5 |
| displaySummary["Cr6-D"]["Summary Stat."] = 0.85 # DisMat(13, 21) = 0.85 |
| @@ -3034,13 +3025,9 @@ |
| displaySummary["Cr-T"]["Summary Stat."] = 0.5 # add 'chromium' assessment that runs on chromium6 standards, tcw |
| displaySummary["Cu-D"]["Summary Stat."] = 0.85 # DisMat(13, 23) = 0.85 |
| displaySummary["Cu-T"]["Summary Stat."] = 0.5 # DisMat(13, 24) = 0.5 |
| - displaySummary["Cyanide-T"][ |
| - "Summary Stat." |
| - ] = 0.85 # DisMat(13, 25) = 0.85 # cyanide |
| + displaySummary["Cyanide-T"]["Summary Stat."] = 0.85 # DisMat(13, 25) = 0.85 # cyanide |
| displaySummary["DO-D"]["Summary Stat."] = 0.15 # DisMat(13, 26) = 0.15 |
| - displaySummary["E.coli"][ |
| - "Summary Stat." |
| - ] = "geomean" # DisMat(13, 27) = "geomean" |
| + displaySummary["E.coli"]["Summary Stat."] = "geomean" # DisMat(13, 27) = "geomean" |
| displaySummary["Fe-D"]["Summary Stat."] = 0.27 # DisMat(13, 28) = 0.27 #FeD |
| displaySummary["Fe-T"]["Summary Stat."] = 0.5 # DisMat(13, 29) = 0.5 |
| displaySummary["Fluoride-T"]["Summary Stat."] = 0.5 # DisMat(13, 30) = 0.5 |
| @@ -5682,32 +5669,20 @@ |
| # Pctcount = Pctcount + 1 |
| # # End if |
| # # Loop |
| - if ( |
| - key == "Fe-D" and displaySummary[key]["Water Supply"] == 300 |
| - ): # added to account for 85th percentile calcs for known values of secondary water supply standards, tcw |
| + if (key == "Fe-D" and displaySummary[key]["Water Supply"] == 300): # added to account for 85th percentile calcs for known values of secondary water supply standards, tcw |
| displaySummary[key]["Summary Stat."] = 0.85 |
| elif key == "Fe-D": # if CalcControl = 28: |
| - displaySummary[key]["Summary Stat."] = self.AmbientStat( |
| - Pctcount, 0.85 |
| - ) # DisMat(13, 28) = AmbientStat(Pctcount, 0.85) |
| + displaySummary[key]["Summary Stat."] = self.AmbientStat(Pctcount, 0.85) # DisMat(13, 28) = AmbientStat(Pctcount, 0.85) |
| # End if |
| - if ( |
| - key == "Mn-D" and displaySummary[key]["Water Supply"] == 50 |
| - ): # added to account for 85th percentile calcs for known values of secondary water supply standards, tcw |
| + if (key == "Mn-D" and displaySummary[key]["Water Supply"] == 50): # added to account for 85th percentile calcs for known values of secondary water supply standards, tcw |
| displaySummary[key]["Summary Stat."] = 0.85 |
| elif key == "Mn-D": # if CalcControl = 34: |
| - displaySummary[key]["Summary Stat."] = self.AmbientStat( |
| - Pctcount, 0.85 |
| - ) # DisMat(13, 34) = AmbientStat(Pctcount, 0.85) |
| + displaySummary[key]["Summary Stat."] = self.AmbientStat(Pctcount, 0.85) # DisMat(13, 34) = AmbientStat(Pctcount, 0.85) |
| # End if |
| - if ( |
| - key == "SO4-T" and displaySummary[key]["Water Supply"] == 250 |
| - ): # added to account for 85th percentile calcs for known values of secondary water supply standards, tcw |
| + if (key == "SO4-T" and displaySummary[key]["Water Supply"] == 250): # added to account for 85th percentile calcs for known values of secondary water supply standards, tcw |
| displaySummary[key]["Summary Stat."] = 0.85 |
| elif key == "SO4-T": # if CalcControl = 51: |
| - displaySummary[key]["Summary Stat."] = self.AmbientStat( |
| - Pctcount, 0.85 |
| - ) # DisMat(13, 51) = AmbientStat(Pctcount, 0.85) |
| + displaySummary[key]["Summary Stat."] = self.AmbientStat(Pctcount, 0.85) # DisMat(13, 51) = AmbientStat(Pctcount, 0.85) |
| # End if |
| |
| # RePreserve paraArray(Pctcount) #trims blanks off bottom of array |
| @@ -12997,21 +12972,13 @@ |
| [100, 0.413, 0.78, 0.9], |
| ] |
| for row in ambientTable: # For L1 = 2 To 97 |
| - if ( |
| - row[0] == SampleSize |
| - ): # if Worksheets("ambient table").Cells(L1, 1).Value = SampleSize: |
| + if row[0] == SampleSize: # if Worksheets("ambient table").Cells(L1, 1).Value = SampleSize: |
| if TargetStat == 0.5: # if TargetStat = 0.5: |
| - return row[ |
| - 1 |
| - ] # AmbientStat = Worksheets("ambient table").Cells(L1, 2).Value |
| + return row[1] # AmbientStat = Worksheets("ambient table").Cells(L1, 2).Value |
| elif TargetStat == 0.85: # if TargetStat = 0.85: |
| - return row[ |
| - 2 |
| - ] # AmbientStat = Worksheets("ambient table").Cells(L1, 3).Value |
| + return row[2] # AmbientStat = Worksheets("ambient table").Cells(L1, 3).Value |
| elif TargetStat == 0.95: # if TargetStat = 0.95: |
| - return row[ |
| - 3 |
| - ] # AmbientStat = Worksheets("ambient table").Cells(L1, 4).Value |
| + return row[3] # AmbientStat = Worksheets("ambient table").Cells(L1, 4).Value |
| # End if |
| # Next L1 |
| return None |