-------------------------------------------------------------- LAMSImage-FromLBGW-15Jul10.cpp LAMSImage-FromLBGW-11Dec09.cpp -------------------------------------------------------------- The PC upgraded to slc5. Just had to declare spotSeparation before I use the goto statement, to remove the error of cross initialization of this variable. -------------------------------------------------------------- LAMSImage-FromLBGW-11Dec09.cpp LAMSImage-FromLBGW-05Dec09.cpp -------------------------------------------------------------- changes to the logic of assigning 'quality'. Quality is now initiated as 4, if the .bmp file cannot be opened after 3 attempts, it is set to -1 and goes straight to 'BadImage'. If the file is opened, but for any of the spots, it finds nbins==0, the quality is set to 1 and no checking to match cameras is done. It goes straight to 'PrintOutValues'. If q!=1, the checking to match a 'known' camera is done. Now if it could not match it to any cameras, any camID will not be assigned (it is now initialized as TString camID; before it was TString camID=cam;). Logic: ****** 0 means all ok 1 means one or both spots could not be found, i.e. nbins was 0 for any or both of them 2 found two spots, could match only one of them to the 'correct' camera 3 found two spots, both match to another camera than the one in the image file name 4 found two spots, but did not qualify for q=0, 2 or 3, and in this case, no camID will be set -1 could not open the .bmp file even after 3 attemps ------------------------------------------------------------- LAMSImage-FromLBGW-5Dec09.cpp LAMSImage-FromLBGW-01Dec09.cpp ------------------------------------------------------------- change the 'struct' for outputting radial separation to PVSS 54a55 > // double radSep; 56d56 < double radSep; 57a58 > double radSep; 71c72 < DimService LAMSResults( "RichLAMS/ImgAnalResults", "D:8;I:1", (void*)&result, sizeof(result) ); --- > DimService LAMSResults( "RichLAMS/ImgAnalResults", "D:7;I:1;D:1", (void*)&result, sizeof(result) ); ------------------------------------------------------------- LAMSImage-FromLBGW-30Nov09.cpp LAMSImage-FromLBGW-01Dec09.cpp ------------------------------------------------------------- remove special threshold settings for cam3 466c466 < if(oneOrtwo=='1' && camStr=="3" && yvalue<0) threshold=0.8; //----------------->box 4 --- > // if(oneOrtwo=='1' && camStr=="3" && yvalue<0) threshold=0.8; //----------------->box 4 582c582 < if(oneOrtwo=='1' && camStr=="3"&& yvalue>0) thresholdII=0.5; // ----------> R1cam03 - previosuly box 4 --- > // if(oneOrtwo=='1' && camStr=="3"&& yvalue>0) thresholdII=0.5; // ----------> R1cam03 - previosuly box 4 ------------------------------------------------------------- LAMSImage-FromLBGW-23Nov09.cpp LAMSImage-FromLBGW-30Nov09.cpp ------------------------------------------------------------- Cahnge radius1 and radius2 for cam3 350c350,352 < radius1=60; radius2=40; deltaRad=150; thresholdII=0.8; --- > if (camStr=='3') { radius1 =100; radius2=80;} > else { radius1=60; radius2=40; } > deltaRad=150; thresholdII=0.8; ------------------------------------------------------------- LAMSImage-FromLBGW-22Nov09.cpp LAMSImage-FromLBGW-23Nov09.cpp ------------------------------------------------------------- Also output the radial separation to PVSS 57a58 > double radSep; 70,71c71,72 < ImgAnalysisResults result= {0,0,0,0,0,0,0,999}; < DimService LAMSResults( "RichLAMS/ImgAnalResults", "D:7;I:1", (void*)&result, sizeof(result) ); --- > ImgAnalysisResults result= {0,0,0,0,0,0,0,999, 0}; > DimService LAMSResults( "RichLAMS/ImgAnalResults", "D:7;I:1;D:1", (void*)&result, sizeof(result) ); 962c963 < --- > 976a978,981 > double spotSeparation = sqrt(pow(xVal[3]-xVal[1],2)+pow(yVal[3]-yVal[1],2)); > std::cout<<" radial separation is :"< writefile< 995c1000 < // Results.radSep = sqrt(pow(xVal[3]-xVal[1],2)+pow(yVal[3]-yVal[1],2)); --- > Results.radSep = spotSeparation;// sqrt(pow(xVal[3]-xVal[1],2)+pow(yVal[3]-yVal[1],2)); 1006,1008c1011 < // std::cout << "Radial Separation " << Results.radSep < std::cout << "Radial Separation " << Results.radSep < Results.radSep = sqrt(pow(xVal[3]-xVal[1],2)+pow(yVal[3]-yVal[1],2)); 1041a1045 > std::cout << "Radial Separation " << Results.radSep < writefile<RedirectOutput(0); 1059a1060,1061 > std::cout<<"************ End of log from this analysis ************ \n\n"< gSystem->RedirectOutput(0); ------------------------------------------------------------- LAMSImage-FromLBGW-20Nov09.cpp LAMSImage-FromLBGW-22Nov09.cpp ------------------------------------------------------------- Remove the assignment of 6 as a quality. It was blocking proper data to go into PVSS, one just cannot help the faint reference spots!! Editied array values, used to recognize which camera it was -------------------------------------------------------------- LAMSImage-FromLBGW-24July09.cpp LAMSImage-FromLBGW-20Nov09.cpp -------------------------------------------------------------- removed "ambiguity" if the if-else statements and error messages in the 'PrintOutValues' Some reshuffling: removal of unnecessary lines of code and adding/changing messages going to the log file -------------------------------------------------------------- LAMSImage-FromLBGW-10Jun09.cpp LAMSImage-FromLBGW-24July09.cpp -------------------------------------------------------------- Editied array values, used to recognize which camera it was Introduce 6 as a possible value of quality. It signifies that the reference spot was too faint for the analysis to be sure which camera it was. ------------------------------------------------------------- LAMSImage-FromLBGW-15May09.cpp LAMSImage-FromLBGW-10Jun09.cpp ------------------------------------------------------------- The previous problem continues, and the analysis was not analysing the images at all. The results, which were rubbish, were being sent to DIM because quality was initialized as 0, so now it is initialized as 999 and the logic says if(Results.quality<10)LAMSResults.updateService(); The conversion to bmp file is now done by Chris, and the analysis is given a bmp file already. It will just attempt to open it 3 times, and if not successful will return code 4 Editied array values, used to recognize which camera it was ------------------------------------------------------------- LAMSImage-FromLBGW-14May09.cpp LAMSImage-FromLBGW-15May09.cpp ------------------------------------------------------------- adding some verbose messages about how the convert to bmp file happened. There had been problems indicating that the convert command was failing ------------------------------------------------------------ LAMSImage-FromLBGW-8May09.cpp LAMSImage-FromLBGW-14May09.cpp ------------------------------------------------------------ Some reshuffling: removal of unnecessary lines of code and adding/changing messages going to the log file Definition of spot intensity changed on Dave's request. Previously it was IC2 IF2 IC1 IF1 which was the highest bin content. And the course ones went into my plots and also PVSS Now I make it: IC1av IC1Full IC2av IC2Full where av is the av bin content of the bins used to make the spot (a function of the threshold ofcourse, but since it is the same for all cameras, its ok) and Full is the sum of bin content of the bins used to make the spot. ----------------------------------------------------------- LAMSImage-FromLBGW-6May09.cpp LAMSImage-FromLBGW-8May09.cpp ----------------------------------------------------------- Some reshuffling: removal of unnecessary lines of code and adding/changing messages going to the log file ------------------------------------------------------------------ LAMSImage-FromLBGW-2May09-Edited.cpp LAMSImage-FromLBGW-6May09.cpp ------------------------------------------------------------------ Some reshuffling: removal of unnecessary lines of code and adding/changing messages going to the log file ------------------------------------------------------------------ LAMSImage-FromLBGW-2May09.cpp LAMSImage-FromLBGW-2May09-Edited.cpp ------------------------------------------------------------------ cameras are numbered from 0 to 3 now, but some of th special conditions meant to be executed for cam4 (now 3) still had in the code if(canStr=="4") which obviously does not work, so I updated that . Editied array values, used to recognize which camera it was Change the array element numbers, in the logical part of 'Checking' now that the reference wuantities go firts, even for cam4 (noew cam3)