[nodes] rename PanoramaExternalInfo to PanoramaInit

* update HDRI pipeline
* rename the fake tractor dependency param to make it more explicit that
it is only used for dependency (and not as a real input)
This commit is contained in:
Fabien Castan 2020-02-27 16:54:10 +01:00
parent 20c0e04c67
commit 8929456ae4
2 changed files with 17 additions and 17 deletions

View file

@ -135,21 +135,21 @@ def hdriPipeline(graph):
featureExtraction = graph.addNewNode('FeatureExtraction',
input=ldr2hdr.outSfMDataFilename)
featureExtraction.describerPreset.value = 'high'
imageMatching = graph.addNewNode('ImageMatching',
panoramaInit = graph.addNewNode('PanoramaInit',
input=featureExtraction.input,
dependency=[featureExtraction.output] # Workaround for tractor submission with a fake dependency
)
imageMatching = graph.addNewNode('ImageMatching',
input=panoramaInit.outSfMDataFilename,
featuresFolders=[featureExtraction.output])
featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input,
featuresFolders=imageMatching.featuresFolders,
imagePairsList=imageMatching.output)
panoramaExternalInfo = graph.addNewNode('PanoramaExternalInfo',
input=ldr2hdr.outSfMDataFilename,
matchesFolders=[featureMatching.output] # Workaround for tractor submission with a fake dependency
)
panoramaEstimation = graph.addNewNode('PanoramaEstimation',
input=panoramaExternalInfo.outSfMDataFilename,
input=featureMatching.input,
featuresFolders=featureMatching.featuresFolders,
matchesFolders=[featureMatching.output])
@ -162,9 +162,9 @@ def hdriPipeline(graph):
return [
cameraInit,
featureExtraction,
panoramaInit,
imageMatching,
featureMatching,
panoramaExternalInfo,
panoramaEstimation,
panoramaWarping,
panoramaCompositing,