Changed ~ to _ wherever necessary

fabienbaron · Aug 1, 2024 · e811536 · e811536
1 parent db96558
commit e811536
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/demos/example_binary_gridsearch.jl b/demos/example_binary_gridsearch.jl
@@ -122,7 +122,7 @@ finish!(p)
 imdisp(chi2_map, pixsize = gridstep, colormap = "gist_heat_r", figtitle="Binary search: lighter is more probable")
 minchi2, radec = findmin(chi2_map)
 i=radec[1]; j = radec[2]
-chi2_map[i,j], opt_params, ~ =  fit_model_old(data, visfunc, [init_diameter_primary, init_diameter_secondary, init_flux_ratio, ra[i], dec[j]], lbounds=[0, 0, 0, ra[i]-2*gridstep, dec[j]-2*gridstep], hbounds=[5.0, 5.0, 20.0, ra[i]+2*gridstep, dec[j]+2*gridstep], calculate_vis = false, verbose=false);
+chi2_map[i,j], opt_params, _ =  fit_model_old(data, visfunc, [init_diameter_primary, init_diameter_secondary, init_flux_ratio, ra[i], dec[j]], lbounds=[0, 0, 0, ra[i]-2*gridstep, dec[j]-2*gridstep], hbounds=[5.0, 5.0, 20.0, ra[i]+2*gridstep, dec[j]+2*gridstep], calculate_vis = false, verbose=false);
 print("Best chi2: $(chi2_map[i,j]) at Initial: ra=$(ra[i]) mas and dec=$(dec[j]) mas / Final: ra=$(opt_params[4]) mas and dec=$(opt_params[5]) mas, diameter_primary = $(opt_params[1]), diameter_secondary = $(opt_params[2]), flux_ratio = $(opt_params[3])\n");
 
 

diff --git a/demos/example_chara_plan.jl b/demos/example_chara_plan.jl
@@ -18,12 +18,12 @@ obsdate = DateTime(2020, 6, 03);
 facility = read_facility_file("./data/CHARA.txt");
 lat, lon = facility.lat[1], facility.lon[1]; #CHARA
 
-lst_midnight, ~ = hour_angle_calc(obsdate+Dates.Day(1)+Dates.Hour(7),lon, ra)
+lst_midnight, _ = hour_angle_calc(obsdate+Dates.Day(1)+Dates.Hour(7),lon, ra)
 lst_midnight = lst_midnight[1];
 
 # Dark Observability
-~, UTC_set = sunrise_sunset(obsdate, lat, lon);
-UTC_rise, ~ = sunrise_sunset(obsdate+Dates.Day(1), lat, lon);
+_, UTC_set = sunrise_sunset(obsdate, lat, lon);
+UTC_rise, _ = sunrise_sunset(obsdate+Dates.Day(1), lat, lon);
 dark_offset = 0; #in hours, set offset to 1 or 2 for deeper dark
 utc = collect(range(UTC_set+dark_offset, UTC_rise-dark_offset, step=1.0/60));
 lst, ha = hour_angle_calc(hours_to_date(obsdate, utc),lon,ra);

diff --git a/demos/example_companion_gridsearch.jl b/demos/example_companion_gridsearch.jl
@@ -47,7 +47,7 @@ for i=1:length(ra)
     for j=1:length(dec)
         visfunc=(params,uv)->binary_ud_primary_centered(vis_primary, params, ra[i], dec[j], uv, data.uv_baseline)  # flux ratio is primary/secondary 
         #chi2_map[i,j] = model_to_chi2(data,visfunc,[init_diameter_secondary,init_flux_ratio]) # if we don't want to fit
-        chi2_map[i,j], opt_params, ~ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio], lbounds=[0, 0], hbounds=[1.0, .2], calculate_vis = false, verbose=false);
+        chi2_map[i,j], opt_params, _ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio], lbounds=[0, 0], hbounds=[1.0, .2], calculate_vis = false, verbose=false);
         if chi2_map[i,j] < minchi2
             minchi2 = chi2_map[i,j];
             best_par = opt_params;
@@ -69,14 +69,14 @@ start = time()
 Threads.@threads for i = 1:length(ra)
     for j=1:length(dec)
         visfunc=(params,uv)->binary_ud_primary_centered(vis_primary, params, ra[i], dec[j], uv, data.uv_baseline)  # flux ratio is primary/secondary 
-        chi2_map[i,j], opt_params, ~ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio], lbounds=[0, 0], hbounds=[.4, .2], calculate_vis = false, verbose=false);
+        chi2_map[i,j], opt_params, _ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio], lbounds=[0, 0], hbounds=[.4, .2], calculate_vis = false, verbose=false);
     end
 end
 imdisp(chi2_map, pixscale = gridstep, colormap = "gist_heat_r", figtitle="Companion search: lighter is more probable")
 minchi2, radec = findmin(chi2_map)
 i=radec[1]; j = radec[2]
 visfunc=(params,uv)->binary_ud_primary_centered(vis_primary, params, ra[i], dec[j], uv, data.uv_baseline)  # flux ratio is primary/secondary 
-chi2_map[i,j], opt_params, ~ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio], lbounds=[0, 0], hbounds=[.4, .2], calculate_vis = false, verbose=false);
+chi2_map[i,j], opt_params, _ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio], lbounds=[0, 0], hbounds=[.4, .2], calculate_vis = false, verbose=false);
 print("Best chi2: $(chi2_map[i,j]) at ra=$(ra[i]) mas and dec=$(dec[j]) mas, diameter = $(opt_params[1]), flux = $(opt_params[2])\n")
 elapsed = time() - start
 print(elapsed)
@@ -97,7 +97,7 @@ for i=1:length(ra)
     print("New row: ra = $(ra[i]) mas\n")
     for j=1:length(dec)
         visfunc=(params,uv)->binary_ud_primary_centered_radec(vis_primary, params, uv, data.uv_baseline)  # flux ratio is primary/secondary 
-        chi2_map[i,j], opt_params, ~ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio, ra[i], dec[j]], lbounds=[0.0, 0.0, ra[i]-2*gridstep, dec[j]-2*gridstep], hbounds=[4.0, .2, ra[i]+2*gridstep, dec[j]+2*gridstep], calculate_vis = false, verbose=false);
+        chi2_map[i,j], opt_params, _ =  fit_model(data, visfunc, [init_diameter_secondary, init_flux_ratio, ra[i], dec[j]], lbounds=[0.0, 0.0, ra[i]-2*gridstep, dec[j]-2*gridstep], hbounds=[4.0, .2, ra[i]+2*gridstep, dec[j]+2*gridstep], calculate_vis = false, verbose=false);
         if chi2_map[i,j] < minchi2
             minchi2 = chi2_map[i,j];
             best_par = opt_params;