MMVII: Fix BlockCamInit example and User cases for new 5th arg

micmacIGN · Nov 7, 2024 · 59441cb · 59441cb
1 parent 1156e90
commit 59441cb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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
@@ -682,7 +682,7 @@ class cAppli_BlockCamInit : public cMMVII_Appli
 std::vector<std::string>  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