Changeset 1684 for trunk/MagicSoft/Simulation/Detector/Camera
- Timestamp:
- 12/12/02 17:41:13 (22 years ago)
- Location:
- trunk/MagicSoft/Simulation/Detector/Camera
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx
r1674 r1684 21 21 // 22 22 // $RCSfile: camera.cxx,v $ 23 // $Revision: 1.4 7$23 // $Revision: 1.48 $ 24 24 // $Author: blanch $ 25 // $Date: 2002-12-1 0 17:19:31$25 // $Date: 2002-12-12 17:40:50 $ 26 26 // 27 27 //////////////////////////////////////////////////////////////////////// … … 70 70 #include "MMcTrig.hxx" 71 71 #include "MMcRunHeader.hxx" 72 #include "MMcConfigRunHeader.h" 73 #include "MMcCorsikaRunHeader.h" 72 74 #include "MMcTrigHeader.hxx" 73 75 #include "MMcFadcHeader.hxx" … … 799 801 // Set Right Discriminator threshold, taking into account trigger pixels 800 802 803 801 804 Trigger.CheckThreshold(&qThreshold[0]); 802 805 … … 860 863 MRawRunHeader *RunHeader= new MRawRunHeader(); 861 864 MMcRunHeader *McRunHeader = new MMcRunHeader(); 865 MMcConfigRunHeader *McConfigRunHeader = new MMcConfigRunHeader(); 866 MMcCorsikaRunHeader *McCorsikaRunHeader = new MMcCorsikaRunHeader(); 862 867 863 868 // Header branch … … 907 912 HeaderTree.Branch("MMcRunHeader","MMcRunHeader", 908 913 &McRunHeader); 914 915 HeaderTree.Branch("MMcConfigRunHeader","MMcConfigRunHeader", 916 &McConfigRunHeader); 917 918 HeaderTree.Branch("MMcCorsikaRunHeader","MMcCorsikaRunHeader", 919 &McCorsikaRunHeader); 909 920 910 921 if(!Trigger_Loop && Write_McTrig){ … … 1935 1946 still_in_loop = FALSE; 1936 1947 log(SIGNATURE, "Reading ASCII files at the end of the reflector file. . .\n"); 1937 read_ascii(inputfile );1938 break;1948 read_ascii(inputfile, McConfigRunHeader); 1949 //break; 1939 1950 if ((! Data_From_STDIN) && ( !feof(inputfile) )){ 1940 1951 … … 2832 2843 //!@{ 2833 2844 void 2834 read_ascii(FILE *sp )2845 read_ascii(FILE *sp, MMcConfigRunHeader *config) 2835 2846 { 2847 Float_t radius = -1.0; 2848 Float_t focal = -1.0; 2849 Float_t stdfocal = -1.0; 2850 Float_t point = -1.0; 2851 Float_t stdpoint = -1.0; 2852 Float_t adjust = -1.0; 2853 Float_t spot = -1.0; 2854 Float_t camwidth = -1.0; 2855 2856 Char_t token[40]; 2857 Char_t line[511]; 2858 Char_t flag; 2836 2859 cout<<"To be implemented..."<<endl; 2860 while(1){ 2861 if((flag=fgetc(sp))==EOF) 2862 break; 2863 fgets(&line[1],500,sp); 2864 line[0]=flag; 2865 if (line[0]== '#') 2866 continue; 2867 if (strstr(line, "type") == line) 2868 continue; 2869 if (strstr(line, "focal_distance") == line) 2870 sscanf(line,"%s %f",token,&focal); 2871 continue; 2872 if (strstr(line, "focal_std") == line) 2873 continue; 2874 if (strstr(line, "point_spread") == line) 2875 continue; 2876 if (strstr(line, "point_std") == line) 2877 continue; 2878 if (strstr(line, "adjustment_dev") == line) 2879 continue; 2880 if (strstr(line, "black_spot") == line) 2881 continue; 2882 if (strstr(line, "camera_width") == line) 2883 continue; 2884 if (strstr(line, "n_pixels") == line) 2885 continue; 2886 if (strstr(line, "pixel_width") == line) 2887 continue; 2888 if (strstr(line, "n_centralpixels") == line) 2889 continue; 2890 if (strstr(line, "n_gappixels") == line) 2891 continue; 2892 if (strstr(line, "n_mirrors") == line) 2893 continue; 2894 if (strstr(line, "r_mirror") == line) 2895 continue; 2896 if (strstr(line, "define_mirrors") == line) 2897 break; 2898 } 2837 2899 } 2838 2900 … … 3795 3857 // 3796 3858 // $Log: not supported by cvs2svn $ 3859 // Revision 1.47 2002/12/10 17:19:31 blanch 3860 // *** empty log message *** 3861 // 3797 3862 // Revision 1.46 2002/11/08 17:51:00 blanch 3798 3863 // *** empty log message *** … … 3937 4002 // 3938 4003 // $Log: not supported by cvs2svn $ 4004 // Revision 1.47 2002/12/10 17:19:31 blanch 4005 // *** empty log message *** 4006 // 3939 4007 // Revision 1.46 2002/11/08 17:51:00 blanch 3940 4008 // *** empty log message *** -
trunk/MagicSoft/Simulation/Detector/Camera/camera.h
r1674 r1684 19 19 //= 20 20 //= $RCSfile: camera.h,v $ 21 //= $Revision: 1.1 3$21 //= $Revision: 1.14 $ 22 22 //= $Author: blanch $ 23 //= $Date: 2002-12-1 0 17:20:32$23 //= $Date: 2002-12-12 17:41:13 $ 24 24 //= 25 25 //=////////////////////////////////////////////////////////////////////// … … 282 282 void read_QE(void); 283 283 void read_WC(void); 284 void read_ascii( FILE *sp // the input file 284 void read_ascii( FILE *sp, // the input file 285 MMcConfigRunHeader *config 285 286 ); 286 287 int pixels_are_neig(int pix1, int pix2); … … 333 334 /* 334 335 *$Log: not supported by cvs2svn $ 336 *Revision 1.13 2002/12/10 17:20:32 blanch 337 **** empty log message *** 338 * 335 339 *Revision 1.12 2002/10/29 17:16:28 blanch 336 340 *Header file for camera.cxx version 1.45
Note:
See TracChangeset
for help on using the changeset viewer.