Changeset 1597 for trunk/MagicSoft/Simulation/Detector/Camera
- Timestamp:
- 11/08/02 17:51:11 (22 years ago)
- Location:
- trunk/MagicSoft/Simulation/Detector/Camera
- Files:
-
- 2 edited
-
Makefile (modified) (3 diffs)
-
camera.cxx (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Simulation/Detector/Camera/Makefile
r1564 r1597 19 19 # 20 20 # $RCSfile: Makefile,v $ 21 # $Revision: 1.2 0$21 # $Revision: 1.21 $ 22 22 # $Author: blanch $ 23 # $Date: 2002-1 0-29 17:24:51 $23 # $Date: 2002-11-08 17:51:11 $ 24 24 # 25 25 ################################################################## … … 83 83 ${INCLUDE_EVITA_MC} \ 84 84 ${INCLUDE_EVITA_RAW} \ 85 ${INCLUDE_MARS_MGEOM} \85 ${INCLUDE_MARS_MGEOM} 86 86 87 87 LIBRARIES = $(SUBDIRS:=.a) … … 866 866 camera.o: moments.h ../include-MC/MCEventHeader.hxx 867 867 camera.o: /usr/include/g++/iomanip.h ../include-CORSIKA/COREventHeader.hxx 868 camera.o: ../include-MC/MC Cphoton.hxx ../../../include-Classes/MBase/MArray.h869 camera.o: ../ include-GENERAL/ranlib.h868 camera.o: ../include-MC/MCEventHeader_2.hxx ../include-MC/MCCphoton.hxx 869 camera.o: ../../../include-Classes/MBase/MArray.h ../include-GENERAL/ranlib.h -
trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx
r1559 r1597 21 21 // 22 22 // $RCSfile: camera.cxx,v $ 23 // $Revision: 1.4 5$23 // $Revision: 1.46 $ 24 24 // $Author: blanch $ 25 // $Date: 2002-1 0-29 17:15:27$25 // $Date: 2002-11-08 17:51:00 $ 26 26 // 27 27 //////////////////////////////////////////////////////////////////////// … … 1588 1588 1589 1589 if (Write_McEvt) { 1590 McEvt->Fill( (UShort_t) mcevth.get_primary() , 1591 mcevth.get_energy(), 1592 mcevth.get_theta(), 1593 mcevth.get_phi(), 1594 mcevth.get_core(), 1595 mcevth.get_coreX(), 1596 mcevth.get_coreY(), 1597 impactD, 1598 (UInt_t)mcevth.get_CORSIKA(), 1599 (UInt_t)mcevth.get_AtmAbs(), 1600 (UInt_t)mcevth.get_MirrAbs()+mcevth.get_OutOfMirr()+mcevth.get_BlackSpot(), 1601 (UInt_t) ncph, 1602 (UInt_t) inumphe, 1603 (UInt_t) inumphensb+inumphe); 1604 } 1590 Float_t ftime, ltime; 1591 if (reflector_file_version<6){ 1592 mcevth.get_times(&ftime, <ime); 1593 McEvt->Fill( -1.0, 1594 (UShort_t) mcevth.get_primary() , 1595 mcevth.get_energy(), 1596 -1.0, 1597 -1.0, 1598 -1.0, 1599 mcevth.get_theta(), 1600 mcevth.get_phi(), 1601 mcevth.get_core(), 1602 mcevth.get_coreX(), 1603 mcevth.get_coreY(), 1604 impactD, 1605 mcevth_2.get_theta_CT(), 1606 mcevth_2.get_phi_CT(), 1607 ftime, 1608 ltime, 1609 0, 1610 0, 1611 0, 1612 0, 1613 0, 1614 0, 1615 0, 1616 (UInt_t)mcevth.get_CORSIKA(), 1617 (UInt_t)mcevth.get_AtmAbs(), 1618 (UInt_t)mcevth.get_MirrAbs()+mcevth.get_OutOfMirr()+mcevth.get_BlackSpot(), 1619 (UInt_t) ncph, 1620 (UInt_t) inumphe, 1621 (UInt_t) inumphensb+inumphe); 1622 } 1623 else{ 1624 Float_t Nmax, t0, tmax, a, b, c, chi2; 1625 mcevth.get_times(&ftime, <ime); 1626 chi2=mcevth_2.get_NKGfit(&Nmax, &t0, &tmax, &a, &b, &c); 1627 McEvt->Fill( mcevth_2.get_evt_number(), 1628 (UShort_t) mcevth_2.get_primary() , 1629 mcevth_2.get_energy(), 1630 mcevth_2.get_thick0(), 1631 mcevth_2.get_first_target(), 1632 mcevth_2.get_z_first_int(), 1633 mcevth_2.get_theta(), 1634 mcevth_2.get_phi(), 1635 mcevth_2.get_core(), 1636 mcevth_2.get_coreX(), 1637 mcevth_2.get_coreY(), 1638 impactD, 1639 mcevth_2.get_theta_CT(), 1640 mcevth_2.get_phi_CT(), 1641 ftime, 1642 ltime, 1643 Nmax, 1644 t0, 1645 tmax, 1646 a, 1647 b, 1648 c, 1649 chi2, 1650 (UInt_t)mcevth_2.get_CORSIKA(), 1651 (UInt_t)mcevth_2.get_AtmAbs(), 1652 (UInt_t)mcevth_2.get_MirrAbs()+mcevth_2.get_OutOfMirr()+mcevth_2.get_BlackSpot(), 1653 (UInt_t) ncph, 1654 (UInt_t) inumphe, 1655 (UInt_t) inumphensb+inumphe); 1656 } 1657 } 1605 1658 // Fill the Tree with the current leaves of each branch 1606 1659 i=EvtTree.Fill() ; … … 1705 1758 1706 1759 if (Write_McEvt){ 1707 McEvt->Fill( (UShort_t) mcevth.get_primary() ,1708 mcevth.get_energy(),1709 mcevth.get_theta(),1710 mcevth.get_phi(),1711 mcevth.get_core(),1712 mcevth.get_coreX(),1713 mcevth.get_coreY(),1714 impactD,1715 (UInt_t)mcevth.get_CORSIKA(),1716 (UInt_t)mcevth.get_AtmAbs(),1717 (UInt_t)mcevth.get_MirrAbs()+mcevth.get_OutOfMirr()+mcevth.get_BlackSpot(),1718 (UInt_t) ncph,1719 (UInt_t) inumphe,1720 (UInt_t) inumphensb+inumphe);1721 1760 } 1722 1761 // We don not count photons out of the camera. … … 1881 1920 corsika, 1882 1921 (UInt_t)(REFL_VERSION_A*100), 1883 (UInt_t)(VERSION*100)); 1922 (UInt_t)(VERSION*100), 1923 0); 1884 1924 1885 1925 // Fill the Header Tree with the current leaves of each branch … … 3369 3409 static char cflag[SIZE_OF_FLAGS + 1]; // auxiliary variable 3370 3410 static MCEventHeader evth; // the event header 3411 static MCEventHeader evth_2; // the event header 3371 3412 static float nphe[iMAXNUMPIX]; // the number of photoelectrons in each pixel 3372 3413 int reflector_file_version; … … 3421 3462 3422 3463 if( isA( cflag, FLAG_START_OF_EVENT )){ // there is a event 3423 3464 3424 3465 // get MCEventHeader 3425 3466 3426 fread( (char*)&evth, evth.mysize(), 1, infile ); 3427 3428 integtime_ns = evth.get_energy(); 3467 if (reflector_file_version<6) 3468 fread( (char*)&evth, evth.mysize(), 1, infile ); 3469 else 3470 fread( (char*)&evth_2, evth_2.mysize(), 1, infile ); 3471 3472 if (reflector_file_version<6) 3473 integtime_ns = evth.get_energy(); 3474 else 3475 integtime_ns = evth_2.get_energy(); 3429 3476 3430 3477 // memorize where we are in the file … … 3637 3684 // 3638 3685 // $Log: not supported by cvs2svn $ 3686 // Revision 1.45 2002/10/29 17:15:27 blanch 3687 // Reading several reflector versions. 3688 // 3639 3689 // Revision 1.44 2002/10/18 16:53:03 blanch 3640 3690 // Modification to read several reflector files. … … 3773 3823 // 3774 3824 // $Log: not supported by cvs2svn $ 3825 // Revision 1.45 2002/10/29 17:15:27 blanch 3826 // Reading several reflector versions. 3827 // 3775 3828 // Revision 1.44 2002/10/18 16:53:03 blanch 3776 3829 // Modification to read several reflector files.
Note:
See TracChangeset
for help on using the changeset viewer.
