Changeset 604 for BAORadio/AmasNancay/trunk
- Timestamp:
- Nov 16, 2011, 12:02:10 PM (13 years ago)
- Location:
- BAORadio/AmasNancay/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
BAORadio/AmasNancay/trunk/etude_mergeAna.pic
r591 r604 1 2 1 3 2 set source $1 … … 438 437 # 439 438 439 graphicatt "" 440 del sonovoff0 sonovoff1 441 objaoper meanOnovOffNoCalib row 0 sonovoff0 442 objaoper meanOnovOffNoCalib row 1 sonovoff1 443 del soffovoff0 soffovoff1 444 objaoper meanOffovOffNoCalib row 0 soffovoff0 445 objaoper meanOffovOffNoCalib row 1 soffovoff1 446 newwin 1 2 447 plot2d sonovoff0 (n/8192)*250+1250 val n>0 "blue cpts notit nsta" 448 plot2d sonovoff1 (n/8192)*250+1250 val n>0 "same red cpts notit nsta" 449 settitle "Raw ON/OFF ${source} Ch 0 (blue) Ch 1 (red) ${ncycles}cycles" ' ' $defatt 450 setaxelabels "Freq. (MHz)" "I (a.u)" $axedefatt 451 plot2d soffovoff0 (n/8192)*250+1250 val n>0 "blue cpts notit nsta" 452 plot2d soffovoff1 (n/8192)*250+1250 val n>0 "same red cpts notit nsta" 453 settitle "Raw OFF/OFF ${source} Ch 0 (blue) Ch 1 (red) ${ncycles}cycles" ' ' $defatt 454 setaxelabels "Freq. (MHz)" "I (a.u)" $axedefatt 455 456 440 457 graphicatt "xylimits=1250,1500,-0.01,0.01" 441 458 del sonoffovoff0 sonoffovoff1 -
BAORadio/AmasNancay/trunk/mergeAnaFiles.cc
r602 r604 844 844 TMatrix<r_4> meanDiffONOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); //(ON-OFF)/GAIN 845 845 TMatrix<r_4> meanDiffONOFFovOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); //(ON-OFF)/Filtered_OFF 846 TMatrix<r_4> meanONovOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); // ON/Filtered_OFF 847 TMatrix<r_4> meanOFFovOFF_noCalib(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); // OFF/Filtered_OFF 846 848 847 849 int totalNumberCycles=0; //total number of cycles … … 934 936 meanDiffONOFFovOFF_noCalib += diffOnOffOvOff_noCalib; 935 937 938 939 //JEC 15/11/11 add ON/OFF and OFF/OFF 940 TMatrix<r_4> onOvOff(aSpecOn,false); 941 onOvOff.Div(aSpecOffFitltered); 942 meanONovOFF_noCalib += onOvOff; 943 944 TMatrix<r_4> offOvOff(aSpecOff,false); 945 offOvOff.Div(aSpecOffFitltered); 946 meanOFFovOFF_noCalib += offOvOff; 947 936 948 totalNumberCycles++; 937 949 … … 948 960 meanDiffONOFFovOFF_noCalib /= (r_4)totalNumberCycles; 949 961 meanDiffONOFF_noCalib /= (r_4)totalNumberCycles; 962 meanONovOFF_noCalib /= (r_4)totalNumberCycles; 963 meanOFFovOFF_noCalib /= (r_4)totalNumberCycles; 950 964 } 951 965 … … 963 977 tag = "meanOvOffNoCalib"; 964 978 fos << PPFNameTag(tag) << meanDiffONOFFovOFF_noCalib; 965 979 980 tag = "meanOnovOffNoCalib"; 981 fos << PPFNameTag(tag) << meanONovOFF_noCalib; 982 983 tag = "meanOffovOffNoCalib"; 984 fos << PPFNameTag(tag) << meanOFFovOFF_noCalib; 985 966 986 }//end save 967 987 }
Note: See TracChangeset
for help on using the changeset viewer.