Changeset cdd676e in sasmodels for explore/beta/testPolyDiseperseSphricalBeta.m

Timestamp:

Jul 9, 2018 8:58:51 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

502c7b8

Parents:

9f2216f

Message:

Update Yun's code to produce <F^{2> and P columns}

File:

• explore/beta/testPolyDiseperseSphricalBeta.m (modified) (3 diffs)

explore/beta/testPolyDiseperseSphricalBeta.m

@@ -3 +3 @@
 
 R0=20;       %mean radius. unit: Angstroms
-PDI=0.15;       %unit: relative polydispersity
+PDI=0.1;       %unit: relative polydispersity
 volF=0.1;
 contrast=6e-6;    %contrast,angstrom^-1, scattering length density difference
 
-Filename='testPolydisperseGaussianSphere2.dat';
+Filename='testPolydisperseGaussianSphere.dat';
 
 Q=[0.001:0.001:0.8];
@@ -57 +57 @@
 NormIQN=IQN/IQN(1);
 
-FileString=strcat('Filename:',Filename, '**R0=', num2str(R0),'**PDI=', num2str(PDI),...
-    '**contrast',num2str(contrast), '**volF=',num2str(volF));
-Outputformat='File format : Q, <FQ>, <FQ>^2, <FQ^2>, betaQ, SQ, SQ_Eff';
-
 FQ2=beta.*IQ;
 
@@ -77 +73 @@
 
 fileID=fopen(Filename,'w');
-fprintf(fileID,'%s\n\r', FileString);
-fprintf(fileID,'%s\n\r', Outputformat);
+
+FileString=strcat('Filename:',Filename, '**R0=', num2str(R0),'**PDI=', num2str(PDI),...
+    '**contrast',num2str(contrast), '**volF=',num2str(volF));
+Outputformat='File format : Q, <FQ>, <FQ^2>, PQ, betaQ, SQ, SQ_Eff';
+fprintf(fileID,'%s\n', FileString);
+fprintf(fileID,'%s\n', Outputformat);
 for i=1:length(Q)
-    %file format : Q, <FQ>, <FQ>^2, <FQ^2>, betaQ, SQ, SQ_Eff
-    fprintf(fileID,'%e\t%e\t%e\t%e\t%e\t%e\t%e\n\r',...
-        Q(i),FQ(i),FQ2(i),IQ(i),beta(i),Sq(i),Sq_eff(i));
+    %file format : Q, <FQ>, <FQ^2>, PQ, betaQ, SQ, SQ_Eff
+    fprintf(fileID,'%e\t%e\t%e\t%e\t%e\t%e\t%e\n',...
+        Q(i),FQ(i),IQN(i),IQ(i),beta(i),Sq(i),Sq_eff(i));
 end