Changeset 2841


Ignore:
Timestamp:
Nov 6, 2019 10:52:39 PM (5 weeks ago)
Author:
gegorbet
Message:

new lims updates scripts directory in ~us3/lims/database/lims_upds

Location:
trunk
Files:
123 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/programs/us_astfem_sim/us_astfem_sim.cpp

    r2745 r2841  
    416416   sim_data_all.description = "Simulation";
    417417
    418    int points    = qRound( ( simparams.bottom - simparams.meniscus ) /
    419                              simparams.radial_resolution ) + 1;
     418//   int points    = qRound( ( simparams.bottom - simparams.meniscus ) /
     419//                             simparams.radial_resolution ) + 1;
     420   int points    = qCeil( ( simparams.bottom - simparams.meniscus ) /
     421                            simparams.radial_resolution ) + 1;
    420422
    421423   sim_data_all.xvalues.resize( points ); // Sets the size of radial grid points array
     
    429431 << sim_data_all.xvalues[0] << sim_data_all.xvalues[points-1];
    430432
    431    sim_data_all.xvalues[ points - 1 ] = simparams.bottom;
    432 DbgLv(1) << "SimPar:MAIN:SetP:  points" << points << "rad0 radn"
    433  << sim_data_all.xvalues[0] << sim_data_all.xvalues[points-1];
     433//   sim_data_all.xvalues[ points - 1 ] = simparams.bottom;
     434//DbgLv(1) << "SimPar:MAIN:SetP:  points" << points << "rad0 radn"
     435// << sim_data_all.xvalues[0] << sim_data_all.xvalues[points-1];
    434436
    435437   // Fill in speed steps with scan times and omega^2t; build raw data
     
    634636
    635637      // Number of radial grid points on the experimental grid; number of scans
    636       int points = qRound( ( af_params.current_bottom - af_params.current_meniscus ) /
    637                             simparams.radial_resolution ) + 1;
     638//      int points = qRound( ( af_params.current_bottom - af_params.current_meniscus ) /
     639//                            simparams.radial_resolution ) + 1;
     640      int points = qCeil( ( af_params.current_bottom - af_params.current_meniscus ) /
     641                          simparams.radial_resolution ) + 1;
    638642      int nscans = simparams.speed_step[ jd ].scans;
    639643
     
    648652DbgLv(1) << "astfem_radial_ranges" << sim_datas[jd].xvalues[0] << sim_datas[jd].xvalues[points-1]
    649653 << af_params.current_meniscus << af_params.current_bottom << jd;
    650       sim_datas[ jd ].xvalues[ points - 1 ] = af_params.current_bottom;
     654//      sim_datas[ jd ].xvalues[ points - 1 ] = af_params.current_bottom;
    651655
    652656      // Set the total size of scans for simulation
     
    859863
    860864      // Set the radius values in data sets
    861       int points          = qRound( ( simparams.bottom - simparams.meniscus ) /
    862                                   simparams.radial_resolution ) + 1;
     865//      int points          = qRound( ( simparams.bottom - simparams.meniscus ) /
     866//                                  simparams.radial_resolution ) + 1;
     867      int points          = qCeil( ( simparams.bottom - simparams.meniscus ) /
     868                                   simparams.radial_resolution ) + 1;
    863869      for ( int jd = 0; jd < nstep; jd++ )
    864870      {  // Set radius values for current speed's dataset
Note: See TracChangeset for help on using the changeset viewer.