From 59441cb04c1e38b4d6784e0397ddc4501ebb2ce5 Mon Sep 17 00:00:00 2001 From: Christophe Meynard Date: Thu, 7 Nov 2024 15:12:32 +0100 Subject: [PATCH] MMVII: Fix BlockCamInit example and User cases for new 5th arg --- .../CERN-Pipelines/Cmd-2023-06-22-NewPannel-5mm.sh | 2 +- MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.bat | 2 +- MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.sh | 2 +- MMVII/src/Instrumental/cBlockCamInit.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MMVII/MMVII-UseCaseDataSet/CERN-Pipelines/Cmd-2023-06-22-NewPannel-5mm.sh b/MMVII/MMVII-UseCaseDataSet/CERN-Pipelines/Cmd-2023-06-22-NewPannel-5mm.sh index 6e59a4e83d..68b3c08d78 100755 --- a/MMVII/MMVII-UseCaseDataSet/CERN-Pipelines/Cmd-2023-06-22-NewPannel-5mm.sh +++ b/MMVII/MMVII-UseCaseDataSet/CERN-Pipelines/Cmd-2023-06-22-NewPannel-5mm.sh @@ -72,7 +72,7 @@ MMVII OriBundleAdj SetFiltered_GCP_OK_Resec.xml BA_311_A BA_311_B GCPDir=Refined #----------------- Rigig Block : Init Calibration + Adjjust---------------- #--------------------------------------------------------------------------- -MMVII BlockCamInit SetFiltered_GCP_OK_Resec.xml BA_311_B "(.*)_(.*).JPG" [1,2] Rig_311_B +MMVII BlockCamInit SetFiltered_GCP_OK_Resec.xml BA_311_B "(.*)_(.*).JPG" [1,2] '[(.*)@(.*)\,$1_$2.JPG,@]' Rig_311_B MMVII OriBundleAdj SetFiltered_GCP_OK_Resec.xml BA_311_B BA_311_C GCPDir=Refined GCPW=[1,1,0.5] BRDirIn=Rig_311_B BRW=[1e-2,1e-5] OutRigBlock=Rig_311_C diff --git a/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.bat b/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.bat index 7d58ee39f6..4dea0a17db 100644 --- a/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.bat +++ b/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.bat @@ -27,7 +27,7 @@ REM Generate a report on GCP quality MMVII ReportGCP .*tif Completed BA2 REM compute an initial value of the block -MMVII BlockCamInit .*tif BA2 "(.*)_(.*)_Scaled.tif" [1,2] Rig +MMVII BlockCamInit .*tif BA2 "(.*)_(.*)_Scaled.tif" [1,2] "[(.*)@(.*),$1_$2_Scaled.tif,@]" Rig REM make a compensation with rigid block MMVII OriBundleAdj .*tif BA2 BA3 GCPW=[1,1,1,5] GCPDir=Completed/ BRDirIn=Rig BRW=[1e-2,1e-5] diff --git a/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.sh b/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.sh index 67e4555d53..9ec877d865 100644 --- a/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.sh +++ b/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/InfoNew.sh @@ -29,7 +29,7 @@ MMVII OriBundleAdj .*tif BA BA2 GCPW=[1,1,1,5] GCPDir=Completed/ MMVII ReportGCP .*tif Completed BA2 # compute an initial value of the block -MMVII BlockCamInit .*tif BA2 "(.*)_(.*)_Scaled.tif" [1,2] Rig +MMVII BlockCamInit .*tif BA2 "(.*)_(.*)_Scaled.tif" [1,2] '[(.*)@(.*),$1_$2_Scaled.tif,@]' Rig # make a compensation with rigid block MMVII OriBundleAdj .*tif BA2 BA3 GCPW=[1,1,1,5] GCPDir=Completed/ BRDirIn=Rig BRW=[1e-2,1e-5] diff --git a/MMVII/src/Instrumental/cBlockCamInit.cpp b/MMVII/src/Instrumental/cBlockCamInit.cpp index 87c7d8d508..dcd7d369ad 100644 --- a/MMVII/src/Instrumental/cBlockCamInit.cpp +++ b/MMVII/src/Instrumental/cBlockCamInit.cpp @@ -682,7 +682,7 @@ class cAppli_BlockCamInit : public cMMVII_Appli std::vector cAppli_BlockCamInit::Samples() const { return { - "MMVII BlockCamInit SetFiltered_GCP_OK_Resec.xml BA_311_B '(.*)_(.*).JPG' [1,2] Rig_311_B" + "MMVII BlockCamInit SetFiltered_GCP_OK_Resec.xml BA_311_B '(.*)_(.*).JPG' [1,2] '[(.*)@(.*),$1_$2.tif,@]' Rig_311_B" }; } cAppli_BlockCamInit::cAppli_BlockCamInit