Skip to content

Commit

Permalink
McXtrace: fixes in the line of #1584
Browse files Browse the repository at this point in the history
  • Loading branch information
farhi committed Mar 5, 2024
1 parent f1c24fd commit c9b1419
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ INITIALIZE

fp=fopen(fullpath_geomfile,"rb");
if (fp==NULL){
fprintf(stderr,"Error: Cannot open file \'%s\'. Aborting.",fullpath_geomfile);
fprintf(stderr,"Error: Cannot open file \'%s\'. Aborting.\n",fullpath_geomfile);
exit(-1);
}
fgets(line,1023,fp);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ INITIALIZE

fp=fopen(fullpath_geomfile,"rb");
if (fp==NULL){
fprintf(stderr,"Error: Cannot open file \'%s\'. Aborting.",fullpath_geomfile);
fprintf(stderr,"Error: Cannot open file \'%s\'. Aborting.\n",fullpath_geomfile);
exit(-1);
}
fgets(line,1023,fp);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ INITIALIZE
"(NOSOLUTE!=0) and set a solute volume fraction of 1 (FSOLV==0).\n");
}
if(NOSOLUTE && NOSOLVENT){
fprintf(stderr,"Warning (Pump_probe_solvent): You have disabled solute and solvent scattering.\nAborting to avoid wasting your time.");
fprintf(stderr,"Warning (Pump_probe_solvent): You have disabled solute and solvent scattering.\nAborting to avoid wasting your time.\n");
exit(0);
}

Expand Down
8 changes: 4 additions & 4 deletions mcxtrace-comps/examples/MAXIV/MAXIV_Bloch/MAXIV_Bloch.instr
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ if (cff && !grating_mode){
/*}*/

if(verbose){
fprintf(stdout,"INFO(%s):Monochromator specs: \n Angle of pre-mirror=%f deg. \n Angle of grating=%f deg.",instrument_name,mirror2_angle,angle_grating);
fprintf(stdout,"INFO(%s):Monochromator specs: \n Angle of pre-mirror=%f deg. \n Angle of grating=%f deg.\n",instrument_name,mirror2_angle,angle_grating);
}
MCAngleVariation=angle_grating*0.99;

Expand Down Expand Up @@ -276,17 +276,17 @@ Error messages:
*******************************************************/
if (angle_grating>30 || angle_grating<0)
{
fprintf(stderr,"ERROR: cPGM grating angle is out of bounds(%f DEG). Simulation ended",angle_grating);
fprintf(stderr,"ERROR: cPGM grating angle is out of bounds(%f DEG). Simulation ended.\n",angle_grating);
exit(-1);
}
if (mirror2_angle>21 || mirror2_angle<0)
{
fprintf(stderr,"ERROR: M2 angle is out of bounds(%f DEG). Simulation ended",mirror2_angle);
fprintf(stderr,"ERROR: M2 angle is out of bounds(%f DEG). Simulation ended.\n",mirror2_angle);
exit(-1);
}
if (theta_PG_NIM>30 || theta_PG_NIM<0)
{
fprintf(stderr,"ERROR: NIM grating angle is out of bounds(%f DEG). Simulation ended",theta_PG_NIM);
fprintf(stderr,"ERROR: NIM grating angle is out of bounds(%f DEG). Simulation ended.\n",theta_PG_NIM);
exit(-1);
}
%}
Expand Down

0 comments on commit c9b1419

Please sign in to comment.