Skip to content

Commit

Permalink
updated #8 and #9 in reconstruction pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
Megna Shah committed Jun 12, 2014
1 parent 4540128 commit fa1c29e
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 147 deletions.
2 changes: 1 addition & 1 deletion Support/PrebuiltPipelines/Workshop/Reconstruction/(08) SmallIN100 Merge Twins.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DataContainerArrayProxy\3\Path=VolumeDataContainer|CellData|FeatureIds
DataContainerArrayProxy\3\DCFlag=2
DataContainerArrayProxy\3\ATTRFlag=2
DataContainerArrayProxy\3\DAFlag=2
DataContainerArrayProxy\4\Path=VolumeDataContainer|CellData|GoodVoxels
DataContainerArrayProxy\4\Path=VolumeDataContainer|CellData|ThresholdArray
DataContainerArrayProxy\4\DCFlag=2
DataContainerArrayProxy\4\ATTRFlag=2
DataContainerArrayProxy\4\DAFlag=2
Expand Down
178 changes: 34 additions & 144 deletions Support/PrebuiltPipelines/Workshop/Reconstruction/(09) SmallIN100 Minimum Size.txt
View file
Original file line number Diff line number Diff line change
@@ -1,229 +1,119 @@
[PipelineBuilder]
Name=(09) SmallIN100 Minimum Size
Number_Filters=3
Version=5.0.6552
Number_Filters=4
Version=5.0.6649

[0]
Filter_Name=DataContainerReader
Filter_Human_Label=Read DREAM3D Data File
InputFile=Data/Output/SmallIN100Cleaned.dream3d
OverwriteExistingDataContainers=0
DataContainerArrayProxy\size=51
DataContainerArrayProxy\size=21
DataContainerArrayProxy\1\Path=VolumeDataContainer|CellData|Confidence Index
DataContainerArrayProxy\1\DCFlag=2
DataContainerArrayProxy\1\ATTRFlag=2
DataContainerArrayProxy\1\DAFlag=2
DataContainerArrayProxy\2\Path=VolumeDataContainer|CellData|CriticalFields1
DataContainerArrayProxy\2\Path=VolumeDataContainer|CellData|EulerAngles
DataContainerArrayProxy\2\DCFlag=2
DataContainerArrayProxy\2\ATTRFlag=2
DataContainerArrayProxy\2\DAFlag=2
DataContainerArrayProxy\3\Path=VolumeDataContainer|CellData|CriticalFields2
DataContainerArrayProxy\3\Path=VolumeDataContainer|CellData|FeatureIds
DataContainerArrayProxy\3\DCFlag=2
DataContainerArrayProxy\3\ATTRFlag=2
DataContainerArrayProxy\3\DAFlag=2
DataContainerArrayProxy\4\Path=VolumeDataContainer|CellData|EulerAngles
DataContainerArrayProxy\4\Path=VolumeDataContainer|CellData|IPFColor
DataContainerArrayProxy\4\DCFlag=2
DataContainerArrayProxy\4\ATTRFlag=2
DataContainerArrayProxy\4\DAFlag=2
DataContainerArrayProxy\5\Path=VolumeDataContainer|CellData|FeatureIds
DataContainerArrayProxy\5\Path=VolumeDataContainer|CellData|Image Quality
DataContainerArrayProxy\5\DCFlag=2
DataContainerArrayProxy\5\ATTRFlag=2
DataContainerArrayProxy\5\DAFlag=2
DataContainerArrayProxy\6\Path=VolumeDataContainer|CellData|FeatureReferenceMisorientations
DataContainerArrayProxy\6\Path=VolumeDataContainer|CellData|ParentIds
DataContainerArrayProxy\6\DCFlag=2
DataContainerArrayProxy\6\ATTRFlag=2
DataContainerArrayProxy\6\DAFlag=2
DataContainerArrayProxy\7\Path=VolumeDataContainer|CellData|Fit
DataContainerArrayProxy\7\Path=VolumeDataContainer|CellData|Phases
DataContainerArrayProxy\7\DCFlag=2
DataContainerArrayProxy\7\ATTRFlag=2
DataContainerArrayProxy\7\DAFlag=2
DataContainerArrayProxy\8\Path=VolumeDataContainer|CellData|GBEuclideanDistances
DataContainerArrayProxy\8\Path=VolumeDataContainer|CellData|Quats
DataContainerArrayProxy\8\DCFlag=2
DataContainerArrayProxy\8\ATTRFlag=2
DataContainerArrayProxy\8\DAFlag=2
DataContainerArrayProxy\9\Path=VolumeDataContainer|CellData|IPFColor_Z
DataContainerArrayProxy\9\Path=VolumeDataContainer|CellData|ThresholdArray
DataContainerArrayProxy\9\DCFlag=2
DataContainerArrayProxy\9\ATTRFlag=2
DataContainerArrayProxy\9\DAFlag=2
DataContainerArrayProxy\10\Path=VolumeDataContainer|CellData|Image Quality
DataContainerArrayProxy\10\Path=VolumeDataContainer|CellEnsembleData|CrystalStructures
DataContainerArrayProxy\10\DCFlag=2
DataContainerArrayProxy\10\ATTRFlag=2
DataContainerArrayProxy\10\DAFlag=2
DataContainerArrayProxy\11\Path=VolumeDataContainer|CellData|KernelAverageMisorientations
DataContainerArrayProxy\11\Path=VolumeDataContainer|CellEnsembleData|LatticeConstants
DataContainerArrayProxy\11\DCFlag=2
DataContainerArrayProxy\11\ATTRFlag=2
DataContainerArrayProxy\11\DAFlag=2
DataContainerArrayProxy\12\Path=VolumeDataContainer|CellData|ParentIds
DataContainerArrayProxy\12\Path=VolumeDataContainer|CellEnsembleData|MaterialName
DataContainerArrayProxy\12\DCFlag=2
DataContainerArrayProxy\12\ATTRFlag=2
DataContainerArrayProxy\12\DAFlag=2
DataContainerArrayProxy\13\Path=VolumeDataContainer|CellData|Phases
DataContainerArrayProxy\13\Path=VolumeDataContainer|CellFeatureData|Active
DataContainerArrayProxy\13\DCFlag=2
DataContainerArrayProxy\13\ATTRFlag=2
DataContainerArrayProxy\13\DAFlag=2
DataContainerArrayProxy\14\Path=VolumeDataContainer|CellData|QPEuclideanDistances
DataContainerArrayProxy\14\Path=VolumeDataContainer|CellFeatureData|AvgQuats
DataContainerArrayProxy\14\DCFlag=2
DataContainerArrayProxy\14\ATTRFlag=2
DataContainerArrayProxy\14\DAFlag=2
DataContainerArrayProxy\15\Path=VolumeDataContainer|CellData|Quats
DataContainerArrayProxy\15\Path=VolumeDataContainer|CellFeatureData|EulerAngles
DataContainerArrayProxy\15\DCFlag=2
DataContainerArrayProxy\15\ATTRFlag=2
DataContainerArrayProxy\15\DAFlag=2
DataContainerArrayProxy\16\Path=VolumeDataContainer|CellData|SEM Signal
DataContainerArrayProxy\16\Path=VolumeDataContainer|CellFeatureData|NeighborList
DataContainerArrayProxy\16\DCFlag=2
DataContainerArrayProxy\16\ATTRFlag=2
DataContainerArrayProxy\16\DAFlag=2
DataContainerArrayProxy\17\Path=VolumeDataContainer|CellData|SchuhColor
DataContainerArrayProxy\17\Path=VolumeDataContainer|CellFeatureData|NumNeighbors
DataContainerArrayProxy\17\DCFlag=2
DataContainerArrayProxy\17\ATTRFlag=2
DataContainerArrayProxy\17\DAFlag=2
DataContainerArrayProxy\18\Path=VolumeDataContainer|CellData|SurfaceVoxels
DataContainerArrayProxy\18\Path=VolumeDataContainer|CellFeatureData|ParentIds
DataContainerArrayProxy\18\DCFlag=2
DataContainerArrayProxy\18\ATTRFlag=2
DataContainerArrayProxy\18\DAFlag=2
DataContainerArrayProxy\19\Path=VolumeDataContainer|CellData|TJEuclideanDistances
DataContainerArrayProxy\19\Path=VolumeDataContainer|CellFeatureData|Phases
DataContainerArrayProxy\19\DCFlag=2
DataContainerArrayProxy\19\ATTRFlag=2
DataContainerArrayProxy\19\DAFlag=2
DataContainerArrayProxy\20\Path=VolumeDataContainer|CellData|ThresholdArray
DataContainerArrayProxy\20\Path=VolumeDataContainer|CellFeatureData|SharedSurfaceAreaList
DataContainerArrayProxy\20\DCFlag=2
DataContainerArrayProxy\20\ATTRFlag=2
DataContainerArrayProxy\20\DAFlag=2
DataContainerArrayProxy\21\Path=VolumeDataContainer|CellEnsembleData|CrystalStructures
DataContainerArrayProxy\21\Path=VolumeDataContainer|NewCellFeatureData|Active
DataContainerArrayProxy\21\DCFlag=2
DataContainerArrayProxy\21\ATTRFlag=2
DataContainerArrayProxy\21\DAFlag=2
DataContainerArrayProxy\22\Path=VolumeDataContainer|CellEnsembleData|LatticeConstants
DataContainerArrayProxy\22\DCFlag=2
DataContainerArrayProxy\22\ATTRFlag=2
DataContainerArrayProxy\22\DAFlag=2
DataContainerArrayProxy\23\Path=VolumeDataContainer|CellEnsembleData|MaterialName
DataContainerArrayProxy\23\DCFlag=2
DataContainerArrayProxy\23\ATTRFlag=2
DataContainerArrayProxy\23\DAFlag=2
DataContainerArrayProxy\24\Path=VolumeDataContainer|CellFeatureData|Active
DataContainerArrayProxy\24\DCFlag=2
DataContainerArrayProxy\24\ATTRFlag=2
DataContainerArrayProxy\24\DAFlag=2
DataContainerArrayProxy\25\Path=VolumeDataContainer|CellFeatureData|AspectRatios
DataContainerArrayProxy\25\DCFlag=2
DataContainerArrayProxy\25\ATTRFlag=2
DataContainerArrayProxy\25\DAFlag=2
DataContainerArrayProxy\26\Path=VolumeDataContainer|CellFeatureData|AvgMisorientations
DataContainerArrayProxy\26\DCFlag=2
DataContainerArrayProxy\26\ATTRFlag=2
DataContainerArrayProxy\26\DAFlag=2
DataContainerArrayProxy\27\Path=VolumeDataContainer|CellFeatureData|AvgQuats
DataContainerArrayProxy\27\DCFlag=2
DataContainerArrayProxy\27\ATTRFlag=2
DataContainerArrayProxy\27\DAFlag=2
DataContainerArrayProxy\28\Path=VolumeDataContainer|CellFeatureData|AxisEulerAngles
DataContainerArrayProxy\28\DCFlag=2
DataContainerArrayProxy\28\ATTRFlag=2
DataContainerArrayProxy\28\DAFlag=2
DataContainerArrayProxy\29\Path=VolumeDataContainer|CellFeatureData|AxisLengths
DataContainerArrayProxy\29\DCFlag=2
DataContainerArrayProxy\29\ATTRFlag=2
DataContainerArrayProxy\29\DAFlag=2
DataContainerArrayProxy\30\Path=VolumeDataContainer|CellFeatureData|Centroids
DataContainerArrayProxy\30\DCFlag=2
DataContainerArrayProxy\30\ATTRFlag=2
DataContainerArrayProxy\30\DAFlag=2
DataContainerArrayProxy\31\Path=VolumeDataContainer|CellFeatureData|CriticalFields1
DataContainerArrayProxy\31\DCFlag=2
DataContainerArrayProxy\31\ATTRFlag=2
DataContainerArrayProxy\31\DAFlag=2
DataContainerArrayProxy\32\Path=VolumeDataContainer|CellFeatureData|CriticalFields2
DataContainerArrayProxy\32\DCFlag=2
DataContainerArrayProxy\32\ATTRFlag=2
DataContainerArrayProxy\32\DAFlag=2
DataContainerArrayProxy\33\Path=VolumeDataContainer|CellFeatureData|EquivalentDiameters
DataContainerArrayProxy\33\DCFlag=2
DataContainerArrayProxy\33\ATTRFlag=2
DataContainerArrayProxy\33\DAFlag=2
DataContainerArrayProxy\34\Path=VolumeDataContainer|CellFeatureData|EulerAngles
DataContainerArrayProxy\34\DCFlag=2
DataContainerArrayProxy\34\ATTRFlag=2
DataContainerArrayProxy\34\DAFlag=2
DataContainerArrayProxy\35\Path=VolumeDataContainer|CellFeatureData|FeatureAvgMisorientations
DataContainerArrayProxy\35\DCFlag=2
DataContainerArrayProxy\35\ATTRFlag=2
DataContainerArrayProxy\35\DAFlag=2
DataContainerArrayProxy\36\Path=VolumeDataContainer|CellFeatureData|MisorientationList
DataContainerArrayProxy\36\DCFlag=2
DataContainerArrayProxy\36\ATTRFlag=2
DataContainerArrayProxy\36\DAFlag=2
DataContainerArrayProxy\37\Path=VolumeDataContainer|CellFeatureData|NeighborList
DataContainerArrayProxy\37\DCFlag=2
DataContainerArrayProxy\37\ATTRFlag=2
DataContainerArrayProxy\37\DAFlag=2
DataContainerArrayProxy\38\Path=VolumeDataContainer|CellFeatureData|NeighborhoodList
DataContainerArrayProxy\38\DCFlag=2
DataContainerArrayProxy\38\ATTRFlag=2
DataContainerArrayProxy\38\DAFlag=2
DataContainerArrayProxy\39\Path=VolumeDataContainer|CellFeatureData|Neighborhoods
DataContainerArrayProxy\39\DCFlag=2
DataContainerArrayProxy\39\ATTRFlag=2
DataContainerArrayProxy\39\DAFlag=2
DataContainerArrayProxy\40\Path=VolumeDataContainer|CellFeatureData|NumCells
DataContainerArrayProxy\40\DCFlag=2
DataContainerArrayProxy\40\ATTRFlag=2
DataContainerArrayProxy\40\DAFlag=2
DataContainerArrayProxy\41\Path=VolumeDataContainer|CellFeatureData|NumNeighbors
DataContainerArrayProxy\41\DCFlag=2
DataContainerArrayProxy\41\ATTRFlag=2
DataContainerArrayProxy\41\DAFlag=2
DataContainerArrayProxy\42\Path=VolumeDataContainer|CellFeatureData|Omega3s
DataContainerArrayProxy\42\DCFlag=2
DataContainerArrayProxy\42\ATTRFlag=2
DataContainerArrayProxy\42\DAFlag=2
DataContainerArrayProxy\43\Path=VolumeDataContainer|CellFeatureData|ParentIds
DataContainerArrayProxy\43\DCFlag=2
DataContainerArrayProxy\43\ATTRFlag=2
DataContainerArrayProxy\43\DAFlag=2
DataContainerArrayProxy\44\Path=VolumeDataContainer|CellFeatureData|Phases
DataContainerArrayProxy\44\DCFlag=2
DataContainerArrayProxy\44\ATTRFlag=2
DataContainerArrayProxy\44\DAFlag=2
DataContainerArrayProxy\45\Path=VolumeDataContainer|CellFeatureData|Poles
DataContainerArrayProxy\45\DCFlag=2
DataContainerArrayProxy\45\ATTRFlag=2
DataContainerArrayProxy\45\DAFlag=2
DataContainerArrayProxy\46\Path=VolumeDataContainer|CellFeatureData|Schmids
DataContainerArrayProxy\46\DCFlag=2
DataContainerArrayProxy\46\ATTRFlag=2
DataContainerArrayProxy\46\DAFlag=2
DataContainerArrayProxy\47\Path=VolumeDataContainer|CellFeatureData|SharedSurfaceAreaList
DataContainerArrayProxy\47\DCFlag=2
DataContainerArrayProxy\47\ATTRFlag=2
DataContainerArrayProxy\47\DAFlag=2
DataContainerArrayProxy\48\Path=VolumeDataContainer|CellFeatureData|SlipSystems
DataContainerArrayProxy\48\DCFlag=2
DataContainerArrayProxy\48\ATTRFlag=2
DataContainerArrayProxy\48\DAFlag=2
DataContainerArrayProxy\49\Path=VolumeDataContainer|CellFeatureData|SurfaceFeatures
DataContainerArrayProxy\49\DCFlag=2
DataContainerArrayProxy\49\ATTRFlag=2
DataContainerArrayProxy\49\DAFlag=2
DataContainerArrayProxy\50\Path=VolumeDataContainer|CellFeatureData|Volumes
DataContainerArrayProxy\50\DCFlag=2
DataContainerArrayProxy\50\ATTRFlag=2
DataContainerArrayProxy\50\DAFlag=2
DataContainerArrayProxy\51\Path=VolumeDataContainer|NewCellFeatureData|Active
DataContainerArrayProxy\51\DCFlag=2
DataContainerArrayProxy\51\ATTRFlag=2
DataContainerArrayProxy\51\DAFlag=2

[1]
Filter_Name=FindSizes
Filter_Human_Label=Find Feature Sizes
CellFeatureAttributeMatrixName=VolumeDataContainer|CellFeatureData|
NumCellsArrayName=NumCells
EquivalentDiametersArrayName=EquivalentDiameters
VolumesArrayName=Volumes
FeatureIdsArrayPath=VolumeDataContainer|CellData|FeatureIds

[2]
Filter_Name=MinSize
Filter_Human_Label=Minimum Size Filter
NumCellsArrayPath=VolumeDataContainer|CellFeatureData|NumCells
FeaturePhasesArrayPath=VolumeDataContainer|CellFeatureData|Phases
FeatureIdsArrayPath=VolumeDataContainer|CellData|FeatureIds
MinAllowedFeatureSize=1
ApplyToSinglePhase=0
PhaseNumber=0

[2]
[3]
Filter_Name=DataContainerWriter
Filter_Human_Label=Write DREAM3D Data File
OutputFile=Data/Output/SmallIN100Cleaned.dream3d
Expand Down
4 changes: 2 additions & 2 deletions Test/PipelineRunnerTest.cpp.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ int main (int argc, char *argv[])
try {
QFileInfo fi(pipelineFile);

DREAM3D::unittest::CurrentMethod = fi.fileName();
DREAM3D::unittest::CurrentMethod = fi.fileName().toStdString();
DREAM3D::unittest::numTests++;

ExecutePipeline(pipelineFile);

TestPassed(fi.fileName());
TestPassed(fi.fileName().toStdString());
DREAM3D::unittest::CurrentMethod = "";
}
catch (TestException& e)
Expand Down

0 comments on commit fa1c29e

Please sign in to comment.