From 6bcb4ca45ec463229b8cd20deb643ed5dede5d59 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Thu, 21 Jan 2016 10:37:05 +0000
Subject: [PATCH] changing load_sac_eff & load_vana algo to blue
refs #14996
---
.../PowderDiffractionISIS-v1_wkflw.dot | 57 ++++++++++++-------
1 file changed, 36 insertions(+), 21 deletions(-)
diff --git a/docs/source/diagrams/PowderDiffractionISIS-v1_wkflw.dot b/docs/source/diagrams/PowderDiffractionISIS-v1_wkflw.dot
index 70967384e6d..84e50f85a5a 100644
--- a/docs/source/diagrams/PowderDiffractionISIS-v1_wkflw.dot
+++ b/docs/source/diagrams/PowderDiffractionISIS-v1_wkflw.dot
@@ -10,6 +10,8 @@ digraph PowderDiffractionISIS {
Focus_one_Start [label="Start Focusing"]
Focus_All_Start [label="Focus All (Run)"]
+
+
subgraph processes {
$process_style
@@ -33,13 +35,26 @@ digraph PowderDiffractionISIS {
subgraph algorithms {
$algorithm_style
+ LoadVan_LoadRaw [label="LoadRaw"]
+ LoadVan_MaskBins [label="MaskBins"]
+ LoadVan_Plus [label="Plus"]
+ LoadVan_CreateSingleVal [label="CreateSingleValuedWorkspace"]
+ LoadVan_LDivide [label="Divide"]
+
LoadSac_CreateSingle_1 [label="CreateSingleValuedWorkspace"]
LoadSac_CreateSingle_2 [label="CreateSingleValuedWorkspace"]
LoadSac_CreateSingle_3 [label="CreateSingleValuedWorkspace"]
+ LoadSac_CreateSingle_4 [label="CreateSingleValuedWorkspace"]
LoadSac_Divide_1 [label="Divide"]
LoadSac_Divide_2 [label="Divide"]
LoadSac_Integrate_1 [label="Integrate"]
LoadSac_Multiply_1 [label="Multiply"]
+ LoadSac_MaskDetectorIf [label="MaskDetectorIf"]
+ LoadSac_SolidAngle [label="SolidAngle"]
+ LoadSac_Multiply [label="Multiply"]
+ LoadSac_ConvertUnits [label="ConvertUnits"]
+ LoadSac_Integration [label="Integration"]
+
CorrAbs_ConvertUnits [label="ConvertUnits"]
CorrAbs_CylinderAbsorption [label="CylinderAbsorption"]
@@ -119,36 +134,36 @@ digraph PowderDiffractionISIS {
}
- subgraph get_data_sum {
- GetDataSum_Start -> LoadRaw
- FileName -> LoadRaw
- LoadRaw -> IfHrpd
- IfHrpd -> MaskBins [label="true"]
- MaskBins -> FirstNonZeroNotFound
+ subgraph load_van_get_data_sum {
+ GetDataSum_Start -> LoadVan_LoadRaw
+ FileName -> LoadVan_LoadRaw
+ LoadVan_LoadRaw -> IfHrpd
+ IfHrpd -> LoadVan_MaskBins [label="true"]
+ LoadVan_MaskBins -> FirstNonZeroNotFound
IfHrpd -> FirstNonZeroNotFound [label="else"]
- FirstNonZeroNotFound -> CreateSingleValuedWorkspace [label="true"]
- FirstNonZeroNotFound -> Plus [label="else"]
- Plus -> CreateSingleValuedWorkspace
- CreateSingleValuedWorkspace -> Divide
+ FirstNonZeroNotFound -> LoadVan_CreateSingleVal [label="true"]
+ FirstNonZeroNotFound -> LoadVan_Plus [label="else"]
+ LoadVan_Plus -> LoadVan_CreateSingleVal
+ LoadVan_CreateSingleVal -> LoadVan_LDivide
}
subgraph load_sac_eff {
LoadSac_Start -> NoSac
- NoSac -> CreateSingleValueWorkspace [label="true"]
+ NoSac -> LoadSac_CreateSingle_4 [label="true"]
NoSac -> SacEff_RunGetDataSum [label="else"]
SacEff_RunGetDataSum -> UampsotalLess
UampsotalLess -> LoadSac_CreateSingle_1 [label="true"]
UampsotalLess -> LoadSac_Integrate_1 [label="else"]
- LoadSac_Integrate_1 -> MaskDetectorIf
- MaskDetectorIf -> SolidAngle
- SolidAngle -> LoadSac_CreateSingle_2
- LoadSac_CreateSingle_2 -> Multiply
- Multiply -> Eff
+ LoadSac_Integrate_1 -> LoadSac_MaskDetectorIf
+ LoadSac_MaskDetectorIf -> LoadSac_SolidAngle
+ LoadSac_SolidAngle -> LoadSac_CreateSingle_2
+ LoadSac_CreateSingle_2 -> LoadSac_Multiply
+ LoadSac_Multiply -> Eff
Eff -> LoadSac_Divide_1 [label="true"]
- LoadSac_Divide_1 -> ConvertUnits
- ConvertUnits -> Integration
- Integration -> LoadSac_Multiply_1
+ LoadSac_Divide_1 -> LoadSac_ConvertUnits
+ LoadSac_ConvertUnits -> LoadSac_Integration
+ LoadSac_Integration -> LoadSac_Multiply_1
LoadSac_Multiply_1 -> LoadSac_CreateSingle_3
LoadSac_CreateSingle_3 -> LoadSac_Divide_2
@@ -245,7 +260,7 @@ digraph PowderDiffractionISIS {
}
- subgraph focus_one {
+ subgraph focus_all {
Focus_All_Start -> Focus_All_Norm
Focus_All_Norm -> Focus_All_LoadSac1 [label="true"]
Focus_All_Norm -> Focus_All_LoadSac2 [label="else"]
@@ -258,4 +273,4 @@ digraph PowderDiffractionISIS {
}
-}
\ No newline at end of file
+}
--
GitLab