Merge pull request #394 from jtwhite79/hotfix_quotes

Hotfix quotes

Author: jtwhite79

CMakeLists.txt

@@ -16,7 +16,6 @@ message(STATUS
 # This logic needs to be considered before project()
 set(_change_MSVC_flags FALSE)
 if(WIN32)
-  add_compile_options(/bigobj)
   if(CMAKE_VERSION VERSION_LESS 3.15.0)
     set(_change_MSVC_flags TRUE)
   else()

benchmarks/basic_tests.py

@@ -8,12 +8,16 @@
 import pyemu
 
 bin_path = os.path.join("test_bin")
+plat = "unknown"
 if "linux" in platform.platform().lower():
     bin_path = os.path.join(bin_path,"linux")
+    plat = "linux"
 elif "darwin" in platform.platform().lower() or "macos" in platform.platform().lower() :
     bin_path = os.path.join(bin_path,"mac")
+    plat = "apple"
 else:
     bin_path = os.path.join(bin_path,"win")
+    plat = "windows"
 
 bin_path = os.path.abspath("test_bin")
 os.environ["PATH"] += os.pathsep + bin_path
@@ -43,6 +47,60 @@
 num_reals = 20
 port = 4021
 
+
+def nonascii_path_test(model_d="ies_10par_xsec"):
+    pyemu.Ensemble.reseed()
+    base_d = os.path.join(model_d, "template")
+    new_d = os.path.join(model_d, "test_template_\u0187")
+    if os.path.exists(new_d):
+        shutil.rmtree(new_d)
+    shutil.copytree(base_d, new_d)
+    print(platform.platform().lower())
+    pst = pyemu.Pst(os.path.join(new_d, "pest.pst"))
+    cmd = pst.model_command[0].split()
+    print(cmd)
+    cmd = "\"\"{0}\" \"{1}\"\"".format(cmd[0],cmd[1])
+    print(cmd)
+    pst.model_command.append(cmd)
+    cmd = pst.model_command[0].split()
+    cmd = "\"\'{0}\' \'{1}\'\"".format(cmd[0],cmd[1])
+    pst.model_command.append(cmd)
+
+    tpl_data = pst.model_input_data
+    tpl_data["pest_file"] = tpl_data.pest_file.apply(lambda x: "\"{0}\"".format(x))
+    tpl_data["model_file"] = tpl_data.model_file.apply(lambda x: "\"{0}\"".format(x))
+    
+    ins_data = pst.model_output_data
+    ins_data["pest_file"] = ins_data.pest_file.apply(lambda x: "\"{0}\"".format(x))
+    ins_data["model_file"] = ins_data.model_file.apply(lambda x: "\"{0}\"".format(x))
+    
+    pst.control_data.noptmax = 1
+    pst.observation_data.loc[pst.nnz_obs_names,"weight"] = 1.0
+    #pst.pestpp_options["panther_agent_freeze_on_fail"] = True
+    pst.pestpp_options["ies_num_reals"] = 5
+    pst.write(os.path.join(new_d, "pest.pst"))
+
+    
+    m_d = os.path.join(model_d,"master_pestpp")
+    if os.path.exists(m_d):
+        shutil.rmtree(m_d)
+    shutil.copytree(new_d,m_d)
+
+    worker_root = os.path.join(model_d + "_\u0187")
+    if os.path.exists(worker_root):
+        shutil.rmtree(worker_root)
+    os.makedirs(worker_root)    
+    try:
+        pyemu.os_utils.start_workers(new_d, exe_path, "pest.pst", 1, master_dir=m_d,
+                               worker_root=worker_root,port=port,verbose=True)
+    except Exception as e:
+        if plat != "windows":
+            raise Exception(e)
+    else:
+        if plat == "windows":
+            raise Exception("should have failed")
+
+
 def basic_test(model_d="ies_10par_xsec"):
     pyemu.Ensemble.reseed()
     base_d = os.path.join(model_d, "template")
@@ -2061,11 +2119,15 @@ def mf6_v5_ies_nonpersistent_test():
     assert found ==  num_workers
 
 
-
+def parse_pst_test():
+    t_d = os.path.join("parse_pst_testfiles","kerry")
+    pyemu.os_utils.run("{0} control.pst".format(exe_path),cwd=t_d)
 
 
 if __name__ == "__main__":
-    basic_test()
+    #parse_pst_test()
+    #basic_test()
+    nonascii_path_test()
 
     #mf6_v5_ies_nonpersistent_test()
     #large_fake_test()
@@ -2080,7 +2142,7 @@ def mf6_v5_ies_nonpersistent_test():
     #plot_collapse_invest()
 
     #run()
-    # mf6_v5_ies_test()
+    #mf6_v5_ies_test()
     #prep_ends()
     #sweep_bin_test()
     # mf6_v5_sen_test()
@@ -2127,7 +2189,7 @@ def mf6_v5_ies_nonpersistent_test():
     #mf6_v5_sen_test()
 
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-opt.exe"),os.path.join("..","bin","win","pestpp-opt.exe"))
-    mf6_v5_opt_stack_test()
+    #mf6_v5_opt_stack_test()
     # mf6_v5_glm_test()
     # mf6_v5_ies_test()
     #cmdline_test()

benchmarks/ies_10par_xsec/template/pest.pst

@@ -50,11 +50,9 @@ head
  h02_09                4.7000000000E+00      0.0000000000E+00       head                 
  h02_10                5.1000000000E+00      0.0000000000E+00       head                 
 * model command line
-mfnwt ./10par_xsec.nam
+mfnwt 10par_xsec.nam
 * model input/output
-.\hk_Layer_1.ref.tpl .\hk_Layer_1.ref
-.\hk_Layer_1.ref.tpl .\nested/really\deep/hk_Layer_1.ref
-.\strt_Layer_1.ref.tpl .\strt_Layer_1.ref
-.\10par_xsec.hds.ins .\10par_xsec.hds
-++panther_transfer_on_finish(10par_xsec.hds,10par_xsec.list)
-++ies_num_reals(5)
+hk_Layer_1.ref.tpl hk_Layer_1.ref
+hk_Layer_1.ref.tpl nested/really\deep/hk_Layer_1.ref
+strt_Layer_1.ref.tpl strt_Layer_1.ref
+10par_xsec.hds.ins 10par_xsec.hds

benchmarks/ies_test_part4.py

@@ -631,7 +631,7 @@ def tenpar_high_phi_test():
     pst.pestpp_options["ies_num_reals"] = 10
     pst.pestpp_options["ies_lambda_mults"] = [0.5, 1.0]
     pst.pestpp_options["lambda_scale_fac"] = [0.9, 1.0]
-    pst.pestpp_options['ies_subset_size'] = 3
+    pst.pestpp_options['ies_subset_size'] = 5
     pst.pestpp_options["ies_debug_high_upgrade_phi"] = True
     pst.pestpp_options["ies_debug_fail_subset"] = True
     pst.pestpp_options["ies_debug_fail_remainder"] = True
@@ -652,7 +652,7 @@ def tenpar_high_phi_test():
     pst.pestpp_options["ies_num_reals"] = 10
     pst.pestpp_options["ies_lambda_mults"] = [0.5, 1.0]
     pst.pestpp_options["lambda_scale_fac"] = [0.9, 1.0]
-    pst.pestpp_options['ies_subset_size'] = 3
+    pst.pestpp_options['ies_subset_size'] = 5
     pst.pestpp_options["ies_debug_high_subset_phi"] = True
     pst.pestpp_options["ies_debug_fail_subset"] = True
     pst.pestpp_options["ies_debug_fail_remainder"] = True
@@ -676,7 +676,7 @@ def tenpar_high_phi_test():
     pst.pestpp_options["ies_num_reals"] = 10
     pst.pestpp_options["ies_lambda_mults"] = [0.5, 1.0]
     pst.pestpp_options["lambda_scale_fac"] = [0.9, 1.0]
-    pst.pestpp_options['ies_subset_size'] = 3
+    pst.pestpp_options['ies_subset_size'] = 5
     #pst.pestpp_options["ies_debug_high_subset_phi"] = True
     #pst.pestpp_options["ies_debug_fail_subset"] = True
     #pst.pestpp_options["ies_debug_fail_remainder"] = True
@@ -1141,7 +1141,7 @@ def tenpar_upgrade_on_disk_test():
 
 
 def multimodal_test():
-    noptmax = 2
+    noptmax = 1
     num_reals = 100
     # can be "circle" or "h"
     func = "circle"
@@ -1391,8 +1391,8 @@ def plot_mm1_results(noptmax=None, func="circle", show_info=False,mm_d = None):
                                                             df=pd.read_csv(fname.replace(".par.", ".obs."), index_col=0))
         mm_pv = oe_pt_mm.phi_vector
         pe_pr = pd.read_csv(os.path.join(mm_d, "mm1.0.par.csv"))
-        pe_pt_mm.index = pe_pt_mm.index.map(lambda x: str(int(np.float(x))))
-        pe_pr.index = pe_pr.index.map(lambda x: str(int(np.float(x))))
+        pe_pt_mm.index = pe_pt_mm.index.map(lambda x: str(int(float(x))))
+        pe_pr.index = pe_pr.index.map(lambda x: str(int(float(x))))
         pe_pr.index = pe_pr.index.map(lambda x: str(x))
 
         if show_info and noptmax > 0:
@@ -1465,7 +1465,7 @@ def h(x, y):
             axes[1].imshow(H, alpha=0.7,extent=(-4,4,-4,4),cmap="jet")
             H = np.flipud(H)
             #axes[0].contour(X,Y,H,color="0.5",linestyles="dashed")
-
+        plt.tight_layout()
         plt.savefig(os.path.join(mm_d, "compare_{0:02d}.png".format(noptmax)),dpi=1000)
         plt.close(fig)
 
@@ -1476,6 +1476,152 @@ def h(x, y):
     pyemu.os_utils.run(cmd, cwd=mm_d)
 
 
+def plot_mm1_results_seq(noptmax=1, func="circle",mm_d = None):
+    import matplotlib.pyplot as plt
+    from matplotlib.patches import Circle
+
+    base_d = os.path.join("mm1", "master_base_{0}".format(func))
+    if mm_d is None:
+        mm_d = os.path.join("mm1", "master_mm_{0}_mt".format(func))
+    pst = pyemu.Pst(os.path.join(base_d, "mm1.pst"))
+    if noptmax is None:
+        noptmax = pst.control_data.noptmax
+    org_noptmax = noptmax + 1
+    figcount = 0
+    for noptmax in [1]:
+        fname = os.path.join(base_d, "mm1.{0}.par.csv".format(noptmax))
+        for i in range(noptmax):
+            if os.path.exists(fname):
+                break
+            fname = os.path.join(base_d, "mm1.{0}.par.csv".format(noptmax - i))
+
+        pe_pt_base = pd.read_csv(fname)
+        oe_pt_base = pyemu.ObservationEnsemble(pst=pst, df=pd.read_csv(fname.replace(".par.", ".obs."), index_col=0))
+        base_pv = oe_pt_base.phi_vector
+
+        fname = os.path.join(mm_d, "mm1.{0}.par.csv".format(noptmax))
+        for i in range(noptmax):
+            if os.path.exists(fname):
+                break
+            fname = os.path.join(mm_d, "mm1.{0}.par.csv".format(noptmax - i))
+        pe_pt_mm = pd.read_csv(fname,index_col=0)
+        pe_pt_mm.index = pe_pt_mm.index.astype(str)
+        oe_pt_mm = pyemu.ObservationEnsemble.from_dataframe(pst=pst,
+                                                            df=pd.read_csv(fname.replace(".par.", ".obs."), index_col=0))
+        oe_pt_mm.index = oe_pt_mm.index.astype(str)
+        mm_pv = oe_pt_mm.phi_vector
+        mm_pv.index = mm_pv.index.astype(str)
+        #mm_pv.sort_values(inplace=True,ascending=False)
+        pe_pr = pd.read_csv(os.path.join(mm_d, "mm1.0.par.csv"),index_col=0)
+        pe_pr.index = pe_pr.index.astype(str)
+        #pe_pt_mm.index = pe_pt_mm.index.map(lambda x: str(int(float(x))))
+        #pe_pr.index = pe_pr.index.map(lambda x: str(int(float(x))))
+        #pe_pr.index = pe_pr.index.map(lambda x: str(x))
+        mm_info_fname = [f for f in os.listdir(mm_d) if "mm1.{0}.".format(noptmax) in f and f.endswith(".mm.info.csv")][0]
+        print(mm_info_fname)
+        
+        mm_df = pd.read_csv(os.path.join(mm_d, mm_info_fname))
+        #mm_df.index = np.arange(mm_df.shape[0])
+        mm_df.loc[:, "pe_real_name"] = mm_df.pe_real_name.apply(lambda x: str(x))
+        mm_df.index = mm_df.pe_real_name
+        mm_df = mm_df.loc[mm_pv.index]
+        print(mm_df.index)
+
+        fig, ax = plt.subplots(1, 1, figsize=(6, 6))
+        c = Circle([0,0],1,edgecolor="r",facecolor="none")
+        ax.add_patch(c)
+
+        ax.scatter(pe_pr.par1.values, pe_pr.par2.values, marker=".", color="0.5", alpha=0.5)
+        ax.set_title("prior")
+        ax.set_ylabel("par2")
+        ax.set_xlabel("par1")
+        plt.tight_layout()
+        plt.savefig(os.path.join(mm_d, "prior.png"),dpi=1000)
+        ax.scatter(pe_pt_base.par1.values, pe_pt_base.par2.values, marker=".", color="b", alpha=0.5)
+        ax.set_title("posterior")
+        
+        plt.tight_layout()
+        plt.savefig(os.path.join(mm_d, "standard_solution.png"),dpi=1000)
+        plt.close(fig)
+
+        previous_pvals = [[],[]]
+        ireal = 0
+        for mm_rname in mm_df.index:
+            if mm_rname not in pe_pt_mm.index:
+                print("missing",mm_rname)
+                continue
+            if np.abs(pe_pr.loc[mm_rname,"par1"]) < 1 and np.abs(pe_pr.loc[mm_rname,"par2"]) < 1:
+                print("skipping",mm_rname)
+                continue
+            nei_cols = mm_df.columns[mm_df.columns.map(lambda x: "neighbor" in x)]
+            mm_rnames = set(pe_pr.index.tolist())
+            df = mm_df.loc[mm_rname, :]
+            neis = df.loc[nei_cols].apply(str)
+            neis = neis.loc[neis.apply(lambda x: x in mm_rnames)]
+            df = df.loc[neis.index]
+            print(neis)
+            # print(pe_pt_mm.index)
+            pe_pr_nei = pe_pr.loc[neis, :]
+            #print(mm_rname, pe_pr.loc[mm_rname, :], pe_pt_mm.loc[mm_rname, :])
+
+            fig, ax = plt.subplots(1, 1, figsize=(6, 6))
+            c = Circle([0,0],1,edgecolor="r",facecolor="none")
+            ax.add_patch(c)
+
+            ax.scatter(pe_pr.par1.values, pe_pr.par2.values, marker=".", color="0.5", alpha=0.5)
+
+            #if len(previous_pvals[0]) > 0:
+            #    ax.scatter(previous_pvals[0],previous_pvals[1],marker='.',color="b",alpha=0.5)
+
+            ax.scatter([pe_pr.loc[mm_rname, "par1"]], [pe_pr.loc[mm_rname, "par2"]], marker="^", color="0.5", s=50)
+            ax.set_title("multimodal upgrade realization {0}".format(mm_rname))
+            ax.set_ylabel("par2")
+            ax.set_xlabel("par1")
+            plt.tight_layout()
+            plt.savefig(os.path.join(mm_d, "seqcompare_{0:02d}.png".format(figcount)),dpi=1000)
+            figcount += 1
+
+            
+            ax.scatter(pe_pr_nei.par1.values, pe_pr_nei.par2.values, marker=".", color="c", s=100)
+            plt.tight_layout()
+            plt.savefig(os.path.join(mm_d, "seqcompare_{0:02d}.png".format(figcount)),dpi=1000)
+            figcount += 1
+            
+            ax.scatter([pe_pt_mm.loc[mm_rname, "par1"]], [pe_pt_mm.loc[mm_rname, "par2"]], marker="^", color="b",
+                            s=50)
+            previous_pvals[0].append(pe_pt_mm.loc[mm_rname, "par1"])
+            previous_pvals[1].append(pe_pt_mm.loc[mm_rname, "par2"])
+            
+            ax.plot([pe_pr.loc[mm_rname, "par1"],pe_pt_mm.loc[mm_rname, "par1"]],[pe_pr.loc[mm_rname, "par2"],pe_pt_mm.loc[mm_rname, "par2"]],
+                "b--",dashes=(1,1),lw=1.5)  
+            plt.tight_layout()
+            plt.savefig(os.path.join(mm_d, "seqcompare_{0:02d}.png".format(figcount)),dpi=1000)
+            plt.close(fig)
+            figcount += 1
+            ireal += 1
+            if ireal > 10:
+                break
+
+    fig, ax = plt.subplots(1, 1, figsize=(6, 6))
+    c = Circle([0,0],1,edgecolor="r",facecolor="none")
+    ax.add_patch(c)
+
+    ax.scatter(pe_pr.par1.values, pe_pr.par2.values, marker=".", color="0.5", alpha=0.5)
+    ax.scatter(pe_pt_mm.par1.values, pe_pt_mm.par2.values, marker=".", color="b", alpha=0.5)
+    ax.set_title("posterior")
+    ax.set_ylabel("par2")
+    ax.set_xlabel("par1")
+    plt.tight_layout()
+    plt.savefig(os.path.join(mm_d, "seqcompare_{0:02d}.png".format(figcount)),dpi=1000)
+    plt.close(fig)
+    figcount += 1
+
+    pyemu.os_utils.run("ffmpeg -i seqcompare_02.png -vf palettegen=16 -y palette.png",
+                       cwd=mm_d)
+    cmd = "ffmpeg -framerate 1  -i seqcompare_%02d.png -i palette.png -y -filter_complex  "
+    cmd += "\"scale=720:-1:flags=lanczos[x];[x][1:v]paletteuse\" -y  -final_delay 250 seqcompare.gif"
+    pyemu.os_utils.run(cmd, cwd=mm_d)
+
 def mm_invest():
     # model_d = "mm1"
     # test_d = os.path.join(model_d,"template")
@@ -4079,7 +4225,12 @@ def tenpar_iqr_bad_phi_sigma_test():
 
 
 if __name__ == "__main__":
-    tenpar_iqr_bad_phi_sigma_test()
+    tenpar_high_phi_test()
+    #tenpar_iqr_bad_phi_sigma_test()
+    #multimodal_test()
+    #plot_mm1_sweep_results()
+    #plot_mm1_results()
+    #plot_mm1_results_seq()
     #tenpar_fixed_restart_test()
     #freyberg_stacked_pe_invest()
     #freyberg_mean_invest()

benchmarks/parse_pst_testfiles/kerry/control.insfile_data.csv

@@ -0,0 +1,2 @@
+pest_file,model_file
+observations.ins,observations.txt

benchmarks/parse_pst_testfiles/kerry/control.obs_data.csv

@@ -0,0 +1,13 @@
+id,x,y,z,obsval,geometry,icpl,ground,model_bottom,z-bot,cell_disv,"(lay;icpl)",lay,obscell_xy,obscell_z,obs_zpillar,obsnme,obgnme,weight
+OBS1,1050,2550,-40,0.305,POINT (1050 2550),395,0.0,-200.0,160.0,395,"(0; 395)",0,"(np.float64(1066.1474805693624); np.float64(2574.632688843268))",-25.0,[ -25.  -75. -150.],OBS1,caldd,5.0
+OBS2,1850,3550,-35,0.229,POINT (1850 3550),280,0.0,-200.0,165.0,280,"(0; 280)",0,"(np.float64(1815.049607145329); np.float64(3560.586374318919))",-25.0,[ -25.  -75. -150.],OBS2,caldd,5.0
+OBS3,250,2350,-45,0.271,POINT (250 2350),403,0.0,-200.0,155.0,403,"(0; 403)",0,"(np.float64(402.71601423564175); np.float64(2271.747494319016))",-25.0,[ -25.  -75. -150.],OBS3,caldd,5.0
+OBS4,750,1150,-45,0.116,POINT (750 1150),334,0.0,-200.0,155.0,334,"(0; 334)",0,"(np.float64(758.7025418640333); np.float64(1155.0187739788619))",-25.0,[ -25.  -75. -150.],OBS4,caldd,5.0
+OBS5,2350,2350,-10,0.092,POINT (2350 2350),245,0.0,-200.0,190.0,245,"(0; 245)",0,"(np.float64(2317.9676510593804); np.float64(2316.6144324126326))",-25.0,[ -25.  -75. -150.],OBS5,caldd,5.0
+OBS6,2450,3450,-80,0.088,POINT (2450 3450),165,0.0,-200.0,120.0,673,"(1; 165)",1,"(np.float64(2399.5532462859396); np.float64(3468.4153901146906))",-75.0,[ -25.  -75. -150.],OBS6,caldd,5.0
+OBS7,1150,1650,-90,0.277,POINT (1150 1650),360,0.0,-200.0,110.0,868,"(1; 360)",1,"(np.float64(1147.001244348818); np.float64(1592.1513338395089))",-75.0,[ -25.  -75. -150.],OBS7,caldd,5.0
+OBS8,1950,550,-65,0.156,POINT (1950 550),91,0.0,-200.0,135.0,599,"(1; 91)",1,"(np.float64(1964.723677149349); np.float64(536.5812289024334))",-75.0,[ -25.  -75. -150.],OBS8,caldd,5.0
+OBS9,950,2250,-120,1.015,POINT (950 2250),377,0.0,-200.0,80.0,1393,"(2; 377)",2,"(np.float64(943.1219420733914); np.float64(2309.6464332934934))",-150.0,[ -25.  -75. -150.],OBS9,caldd,5.0
+OBS10,350,1250,-190,1.449,POINT (350 1250),420,0.0,-200.0,10.0,1436,"(2; 420)",2,"(np.float64(338.60569833541666); np.float64(1221.7603030387622))",-150.0,[ -25.  -75. -150.],OBS10,caldd,5.0
+OBS11,2350,1350,-150,0.222,POINT (2350 1350),227,0.0,-200.0,50.0,1243,"(2; 227)",2,"(np.float64(2367.7900815530816); np.float64(1369.8735545258714))",-150.0,[ -25.  -75. -150.],OBS11,caldd,5.0
+OBS12,1250,3650,-175,0.52,POINT (1250 3650),497,0.0,-200.0,25.0,1513,"(2; 497)",2,"(np.float64(1283.4104239163364); np.float64(3658.708674153864))",-150.0,[ -25.  -75. -150.],OBS12,caldd,5.0

benchmarks/parse_pst_testfiles/kerry/control.obs_data_extra_commas.csv

@@ -0,0 +1,13 @@
+id,x,y,z,obsval,geometry,icpl,ground,model_bottom,z-bot,cell_disv,"(lay,icpl)",lay,obscell_xy,obscell_z,obs_zpillar,obsnme,obgnme,weight
+OBS1,1050,2550,-40,0.305,POINT (1050 2550),395,0.0,-200.0,160.0,395,"(0, 395)",0,"(np.float64(1066.1474805693624), np.float64(2574.632688843268))",-25.0,[ -25.  -75. -150.],OBS1,caldd,5.0
+OBS2,1850,3550,-35,0.229,POINT (1850 3550),280,0.0,-200.0,165.0,280,"(0, 280)",0,"(np.float64(1815.049607145329), np.float64(3560.586374318919))",-25.0,[ -25.  -75. -150.],OBS2,caldd,5.0
+OBS3,250,2350,-45,0.271,POINT (250 2350),403,0.0,-200.0,155.0,403,"(0, 403)",0,"(np.float64(402.71601423564175), np.float64(2271.747494319016))",-25.0,[ -25.  -75. -150.],OBS3,caldd,5.0
+OBS4,750,1150,-45,0.116,POINT (750 1150),334,0.0,-200.0,155.0,334,"(0, 334)",0,"(np.float64(758.7025418640333), np.float64(1155.0187739788619))",-25.0,[ -25.  -75. -150.],OBS4,caldd,5.0
+OBS5,2350,2350,-10,0.092,POINT (2350 2350),245,0.0,-200.0,190.0,245,"(0, 245)",0,"(np.float64(2317.9676510593804), np.float64(2316.6144324126326))",-25.0,[ -25.  -75. -150.],OBS5,caldd,5.0
+OBS6,2450,3450,-80,0.088,POINT (2450 3450),165,0.0,-200.0,120.0,673,"(1, 165)",1,"(np.float64(2399.5532462859396), np.float64(3468.4153901146906))",-75.0,[ -25.  -75. -150.],OBS6,caldd,5.0
+OBS7,1150,1650,-90,0.277,POINT (1150 1650),360,0.0,-200.0,110.0,868,"(1, 360)",1,"(np.float64(1147.001244348818), np.float64(1592.1513338395089))",-75.0,[ -25.  -75. -150.],OBS7,caldd,5.0
+OBS8,1950,550,-65,0.156,POINT (1950 550),91,0.0,-200.0,135.0,599,"(1, 91)",1,"(np.float64(1964.723677149349), np.float64(536.5812289024334))",-75.0,[ -25.  -75. -150.],OBS8,caldd,5.0
+OBS9,950,2250,-120,1.015,POINT (950 2250),377,0.0,-200.0,80.0,1393,"(2, 377)",2,"(np.float64(943.1219420733914), np.float64(2309.6464332934934))",-150.0,[ -25.  -75. -150.],OBS9,caldd,5.0
+OBS10,350,1250,-190,1.449,POINT (350 1250),420,0.0,-200.0,10.0,1436,"(2, 420)",2,"(np.float64(338.60569833541666), np.float64(1221.7603030387622))",-150.0,[ -25.  -75. -150.],OBS10,caldd,5.0
+OBS11,2350,1350,-150,0.222,POINT (2350 1350),227,0.0,-200.0,50.0,1243,"(2, 227)",2,"(np.float64(2367.7900815530816), np.float64(1369.8735545258714))",-150.0,[ -25.  -75. -150.],OBS11,caldd,5.0
+OBS12,1250,3650,-175,0.52,POINT (1250 3650),497,0.0,-200.0,25.0,1513,"(2, 497)",2,"(np.float64(1283.4104239163364), np.float64(3658.708674153864))",-150.0,[ -25.  -75. -150.],OBS12,caldd,5.0