Index: trunk/MagicSoft/Simulation/Detector/Starfield/Makefile =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/Makefile (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/Makefile (revision 431) @@ -3,5 +3,5 @@ ## Starfield Generator Makefile ## -## $Id: Makefile,v 1.1 2000-01-21 13:36:36 petry Exp $ +## $Id: Makefile,v 1.2 2000-09-21 10:08:10 harald Exp $ ## ################################################################## @@ -112,108 +112,39 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -starfield.o: starfield.h /usr/include/stdlib.h /usr/include/features.h -starfield.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -starfield.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -starfield.o: /usr/include/sys/types.h /usr/include/gnu/types.h -starfield.o: /usr/include/time.h /usr/include/endian.h /usr/include/bytesex.h -starfield.o: /usr/include/sys/select.h /usr/include/selectbits.h -starfield.o: /usr/include/alloca.h /usr/include/string.h /usr/include/math.h -starfield.o: /usr/include/huge_val.h /usr/include/mathcalls.h -starfield.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h -starfield.o: /usr/include/dirent.h /usr/include/direntry.h -starfield.o: /usr/include/posix1_lim.h /usr/include/local_lim.h -starfield.o: /usr/include/linux/limits.h /usr/include/unistd.h -starfield.o: /usr/include/posix_opt.h /usr/include/confname.h +starfield.o: starfield.h /usr/include/stdlib.h /usr/include/standards.h +starfield.o: /usr/include/getopt.h /usr/include/sys/types.h +starfield.o: /usr/include/mach/machine/vm_types.h /usr/include/sys/select.h +starfield.o: /usr/include/string.h /usr/include/strings.h /usr/include/math.h +starfield.o: /usr/include/dirent.h /usr/include/unistd.h +starfield.o: /usr/include/sys/access.h /usr/include/sys/seek.h starfield.o: convertcorsika.h photon.hxx star.hxx /usr/include/stdio.h -starfield.o: /usr/include/libio.h /usr/include/_G_config.h -starfield.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stdarg.h -starfield.o: /usr/include/stdio_lim.h parameters.h -star.o: star.hxx /usr/include/math.h /usr/include/features.h -star.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -star.o: /usr/include/huge_val.h /usr/include/mathcalls.h -star.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h -star.o: /usr/include/string.h -star.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -star.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h -star.o: /usr/include/gnu/types.h -star.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stdarg.h -star.o: /usr/include/stdio_lim.h -photon.o: photon.hxx /usr/include/math.h /usr/include/features.h -photon.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -photon.o: /usr/include/huge_val.h /usr/include/mathcalls.h -photon.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h -photon.o: /usr/include/stdlib.h -photon.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -photon.o: /usr/include/sys/types.h /usr/include/gnu/types.h -photon.o: /usr/include/time.h /usr/include/endian.h /usr/include/bytesex.h -photon.o: /usr/include/sys/select.h /usr/include/selectbits.h -photon.o: /usr/include/alloca.h +starfield.o: /usr/include/va_list.h /usr/include/sys/limits.h +starfield.o: /usr/include/sys/machine/machlimits.h +starfield.o: /usr/include/sys/syslimits.h /usr/include/sys/machine/machtime.h +starfield.o: /usr/include/sys/rt_limits.h parameters.h +star.o: star.hxx /usr/include/math.h /usr/include/standards.h +star.o: /usr/include/stdlib.h /usr/include/getopt.h /usr/include/sys/types.h +star.o: /usr/include/mach/machine/vm_types.h /usr/include/sys/select.h +star.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h +star.o: /usr/include/sys/seek.h /usr/include/va_list.h +star.o: /usr/include/sys/limits.h /usr/include/sys/machine/machlimits.h +star.o: /usr/include/sys/syslimits.h /usr/include/sys/machine/machtime.h +star.o: /usr/include/sys/rt_limits.h +photon.o: photon.hxx /usr/include/math.h /usr/include/standards.h +photon.o: /usr/include/stdlib.h /usr/include/getopt.h +photon.o: /usr/include/sys/types.h /usr/include/mach/machine/vm_types.h +photon.o: /usr/include/sys/select.h convertcorsika.o: convertcorsika.h /usr/include/string.h -convertcorsika.o: /usr/include/features.h /usr/include/sys/cdefs.h -convertcorsika.o: /usr/include/gnu/stubs.h -convertcorsika.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -convertcorsika.o: photon.hxx /usr/include/math.h /usr/include/huge_val.h -convertcorsika.o: /usr/include/mathcalls.h -convertcorsika.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h -convertcorsika.o: /usr/include/stdlib.h /usr/include/sys/types.h -convertcorsika.o: /usr/include/gnu/types.h /usr/include/time.h -convertcorsika.o: /usr/include/endian.h /usr/include/bytesex.h -convertcorsika.o: /usr/include/sys/select.h /usr/include/selectbits.h -convertcorsika.o: /usr/include/alloca.h -parameters.o: parameters.h /usr/include/stdio.h /usr/include/libio.h -parameters.o: /usr/include/features.h /usr/include/sys/cdefs.h -parameters.o: /usr/include/gnu/stubs.h /usr/include/_G_config.h -parameters.o: /usr/include/gnu/types.h -parameters.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -parameters.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stdarg.h -parameters.o: /usr/include/stdio_lim.h -../include-CORSIKA/COREventHeader.o: ../include-CORSIKA/COREventHeader.hxx -../include-CORSIKA/COREventHeader.o: /usr/include/stdlib.h -../include-CORSIKA/COREventHeader.o: /usr/include/features.h -../include-CORSIKA/COREventHeader.o: /usr/include/sys/cdefs.h -../include-CORSIKA/COREventHeader.o: /usr/include/gnu/stubs.h -../include-CORSIKA/COREventHeader.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -../include-CORSIKA/COREventHeader.o: /usr/include/sys/types.h -../include-CORSIKA/COREventHeader.o: /usr/include/gnu/types.h -../include-CORSIKA/COREventHeader.o: /usr/include/time.h -../include-CORSIKA/COREventHeader.o: /usr/include/endian.h -../include-CORSIKA/COREventHeader.o: /usr/include/bytesex.h -../include-CORSIKA/COREventHeader.o: /usr/include/sys/select.h -../include-CORSIKA/COREventHeader.o: /usr/include/selectbits.h -../include-CORSIKA/COREventHeader.o: /usr/include/alloca.h -../include-CORSIKA/COREventHeader.o: /usr/include/math.h -../include-CORSIKA/COREventHeader.o: /usr/include/huge_val.h -../include-CORSIKA/COREventHeader.o: /usr/include/mathcalls.h -../include-CORSIKA/COREventHeader.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h -../include-CORSIKA/CORParticle.o: ../include-CORSIKA/CORParticle.hxx -../include-CORSIKA/CORParticle.o: /usr/include/stdlib.h -../include-CORSIKA/CORParticle.o: /usr/include/features.h -../include-CORSIKA/CORParticle.o: /usr/include/sys/cdefs.h -../include-CORSIKA/CORParticle.o: /usr/include/gnu/stubs.h -../include-CORSIKA/CORParticle.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -../include-CORSIKA/CORParticle.o: /usr/include/sys/types.h -../include-CORSIKA/CORParticle.o: /usr/include/gnu/types.h -../include-CORSIKA/CORParticle.o: /usr/include/time.h /usr/include/endian.h -../include-CORSIKA/CORParticle.o: /usr/include/bytesex.h -../include-CORSIKA/CORParticle.o: /usr/include/sys/select.h -../include-CORSIKA/CORParticle.o: /usr/include/selectbits.h -../include-CORSIKA/CORParticle.o: /usr/include/alloca.h /usr/include/math.h -../include-CORSIKA/CORParticle.o: /usr/include/huge_val.h -../include-CORSIKA/CORParticle.o: /usr/include/mathcalls.h -../include-CORSIKA/CORParticle.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h -../include-CORSIKA/CORStatfile.o: ../include-CORSIKA/CORStatfile.hxx -../include-CORSIKA/CORStatfile.o: /usr/include/stdlib.h -../include-CORSIKA/CORStatfile.o: /usr/include/features.h -../include-CORSIKA/CORStatfile.o: /usr/include/sys/cdefs.h -../include-CORSIKA/CORStatfile.o: /usr/include/gnu/stubs.h -../include-CORSIKA/CORStatfile.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/stddef.h -../include-CORSIKA/CORStatfile.o: /usr/include/sys/types.h -../include-CORSIKA/CORStatfile.o: /usr/include/gnu/types.h -../include-CORSIKA/CORStatfile.o: /usr/include/time.h /usr/include/endian.h -../include-CORSIKA/CORStatfile.o: /usr/include/bytesex.h -../include-CORSIKA/CORStatfile.o: /usr/include/sys/select.h -../include-CORSIKA/CORStatfile.o: /usr/include/selectbits.h -../include-CORSIKA/CORStatfile.o: /usr/include/alloca.h /usr/include/math.h -../include-CORSIKA/CORStatfile.o: /usr/include/huge_val.h -../include-CORSIKA/CORStatfile.o: /usr/include/mathcalls.h -../include-CORSIKA/CORStatfile.o: /usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/include/float.h +convertcorsika.o: /usr/include/standards.h /usr/include/sys/types.h +convertcorsika.o: /usr/include/mach/machine/vm_types.h +convertcorsika.o: /usr/include/sys/select.h /usr/include/strings.h photon.hxx +convertcorsika.o: /usr/include/math.h /usr/include/stdlib.h +convertcorsika.o: /usr/include/getopt.h +parameters.o: parameters.h /usr/include/stdio.h /usr/include/standards.h +parameters.o: /usr/include/sys/seek.h /usr/include/va_list.h +parameters.o: /usr/include/sys/types.h /usr/include/mach/machine/vm_types.h +parameters.o: /usr/include/sys/select.h /usr/include/getopt.h +parameters.o: /usr/include/sys/limits.h /usr/include/sys/machine/machlimits.h +parameters.o: /usr/include/sys/syslimits.h +parameters.o: /usr/include/sys/machine/machtime.h +parameters.o: /usr/include/sys/rt_limits.h Index: trunk/MagicSoft/Simulation/Detector/Starfield/README =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/README (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/README (revision 431) @@ -1,3 +1,3 @@ -$Id: README,v 1.1 2000-01-21 13:36:36 petry Exp $ +$Id: README,v 1.2 2000-09-21 10:08:10 harald Exp $ STARFIELD README @@ -30,6 +30,5 @@ NSB photon rate for each pixel. From this, the camera can then generate the NSB contribution in each shower image using a Poisson -random generator (at present, 21-1-2000, this is not yet implemented -but it will be very soon) and also taking into account the +random generator and also taking into account the atmospheric extinction and its dependence on the zenith angle. @@ -76,4 +75,6 @@ Verbosity level (0 = not verbose, 1 = verbose, 2 = very verbose, 3 = very very ...): 0 + Output file name, starfiel will generate cerXXXX and staXXXXX + CrabNebula Note that the there is a header line followed by pairs of an explanatory @@ -113,11 +114,11 @@ EOF reached; accepted 0 stars from this segment. Accepted 120 stars in total. - Writing binary Cherenkov file ./cer050220 ... + Writing binary Cherenkov file ./cerCrabNebula ... Done. - Writing binary statistics file ./sta050220 ... + Writing binary statistics file ./staCrabNebula ... Done. 6) Using the output. - The two output files (in this case cer050220 and sta050220) are + The two output files (in this case cerCrabNebula and staCrabNebula) are of the same format as the file for a single event in the CORSIKA shower simulation. The number in the name is generated from the @@ -189,4 +190,8 @@ what is going on in detail. + g) Output file name, starfiel will generate cerXXXX and staXXXXX + + This the key name for the output files + 8) parameter file name @@ -199,7 +204,2 @@ the current directory. If no argument is given, it assumes the name of the parameter file is "starfield.par". - - - - - Index: trunk/MagicSoft/Simulation/Detector/Starfield/convertcorsika.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/convertcorsika.cxx (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/convertcorsika.cxx (revision 431) @@ -11,5 +11,5 @@ CORStatfile cerstat; -int convertcorsika(int id, int photnum, photon phot[], float inttime_s, int verbose){ +int convertcorsika(int id, int photnum, photon phot[], float inttime_s, int verbose,char output_name[]){ int i,filenum; @@ -17,6 +17,6 @@ char cor_dir[60]; char stat_dir[60]; - char cor_file[15]; - char stat_file[15]; + char cor_file[20]="cer"; + char stat_file[20]="sta"; filenum=id; @@ -28,8 +28,8 @@ strcpy (cor_dir, "./"); - sprintf(cor_file, "cer%06d",filenum); + strcat(cor_file, output_name); strcat(cor_dir, cor_file); - + // Fill the header of the corsika-like event. @@ -103,9 +103,8 @@ strcpy (stat_dir, "./"); + + //File labeling. - - //File labeling. - - sprintf(stat_file, "sta%06d",filenum); + strcat(stat_file, output_name); strcat(stat_dir, stat_file); @@ -124,3 +123,2 @@ } - Index: trunk/MagicSoft/Simulation/Detector/Starfield/convertcorsika.h =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/convertcorsika.h (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/convertcorsika.h (revision 431) @@ -28,5 +28,5 @@ //Function definition -int convertcorsika(int id, int photnum, photon phot[], float inttime_s, int verbose); +int convertcorsika(int id, int photnum, photon phot[], float inttime_s, int verbose, char output_name[]); #endif Index: trunk/MagicSoft/Simulation/Detector/Starfield/parameters.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/parameters.cxx (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/parameters.cxx (revision 431) @@ -86,4 +86,14 @@ cout << "Verbosity: " << verbose << "\n"; + in->getline(dummy, sizeof(dummy), '\n'); + if(verbose) cout << dummy << "\n"; + if(in->eof()) return(in->good()); + + in->getline(dummy, sizeof(dummy), '\n'); + if(verbose) cout << dummy << "\n"; + sscanf(dummy, "%s", output_file); + cout << "Output Files : cer" << output_file << " and sta"<eof()) return(in->good()); + ct_ra_h = ira_hours + ira_min/60. + ira_sec/3600.; ct_dec_deg = idec_degrees + idec_arcmin/60. + dec_arcsec/3600.; Index: trunk/MagicSoft/Simulation/Detector/Starfield/parameters.h =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/parameters.h (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/parameters.h (revision 431) @@ -24,4 +24,5 @@ float mirr_radius_m; // mirror radius inside which photons are generated char datapath[160]; // path inside which the catalog and extinction files are found + char output_file[160]; int verbose; // verbose flag for switching on/off diagnostic output Index: trunk/MagicSoft/Simulation/Detector/Starfield/starfield.par =================================================================== --- trunk/MagicSoft/Simulation/Detector/Starfield/starfield.par (revision 430) +++ trunk/MagicSoft/Simulation/Detector/Starfield/starfield.par (revision 431) @@ -9,5 +9,7 @@ 10.0 Path inside which the star catalog data can be found: -/usr/users/petry/temp/starfield/sky2000 +/usr/users/magicsol/blanch/Data Verbosity level (0 = not verbose, 1 = verbose, 2 = very verbose, 3 = very very ...): 0 +Output file name, starfiel will generate cerXXXX and staXXXXX +CrabNebula