Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile (revision 411) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile (revision 435) @@ -19,7 +19,7 @@ # # $RCSfile: Makefile,v $ -# $Revision: 1.4 $ -# $Author: MagicSol $ -# $Date: 2000-06-07 11:20:05 $ +# $Revision: 1.5 $ +# $Author: harald $ +# $Date: 2000-09-21 11:47:33 $ # ################################################################## @@ -212,440 +212,4 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -../include-MC/MCEventHeader.o: ../include-MC/MCEventHeader.hxx -../include-MC/MCEventHeader.o: ../include-GENERAL/Rtypes.h -../include-MC/MCEventHeader.o: /usr/include/cxx/iostream.h -../include-MC/MCEventHeader.o: /usr/include/cxx/iostream.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/compnent.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/iostream_impl.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/cxxl.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/cxxl_share.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/messages.hxx -../include-MC/MCEventHeader.o: /usr/include/stddef.h /usr/include/standards.h -../include-MC/MCEventHeader.o: /usr/include/stdio.h /usr/include/sys/seek.h -../include-MC/MCEventHeader.o: /usr/include/va_list.h -../include-MC/MCEventHeader.o: /usr/include/sys/types.h -../include-MC/MCEventHeader.o: /usr/include/mach/machine/vm_types.h -../include-MC/MCEventHeader.o: /usr/include/sys/select.h -../include-MC/MCEventHeader.o: /usr/include/getopt.h -../include-MC/MCEventHeader.o: /usr/include/sys/limits.h -../include-MC/MCEventHeader.o: /usr/include/sys/machine/machlimits.h -../include-MC/MCEventHeader.o: /usr/include/sys/syslimits.h -../include-MC/MCEventHeader.o: /usr/include/sys/machine/machtime.h -../include-MC/MCEventHeader.o: /usr/include/sys/rt_limits.h -../include-MC/MCEventHeader.o: /usr/include/limits.h /usr/include/memory.h -../include-MC/MCEventHeader.o: /usr/include/string.h /usr/include/strings.h -../include-MC/MCEventHeader.o: /usr/include/cxx/iomanip.h -../include-MC/MCEventHeader.o: /usr/include/cxx/iomanip.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/iomanip_impl.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/generic.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/mutex.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/fstream.h -../include-MC/MCEventHeader.o: /usr/include/cxx/fstream.hxx -../include-MC/MCEventHeader.o: /usr/include/cxx/fstream_impl.hxx -../include-MC/MCEventHeader.o: /usr/include/stdlib.h /usr/include/math.h -../include-MC/MCEventHeader.o: ../include-CORSIKA/COREventHeader.hxx -../include-MC/MCCphoton.o: ../include-MC/MCCphoton.hxx -../include-MC/MCCphoton.o: ../include-GENERAL/Rtypes.h -../include-MC/MCCphoton.o: /usr/include/cxx/iostream.h -../include-MC/MCCphoton.o: /usr/include/cxx/iostream.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/compnent.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/iostream_impl.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/cxxl.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/cxxl_share.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/messages.hxx -../include-MC/MCCphoton.o: /usr/include/stddef.h /usr/include/standards.h -../include-MC/MCCphoton.o: /usr/include/stdio.h /usr/include/sys/seek.h -../include-MC/MCCphoton.o: /usr/include/va_list.h /usr/include/sys/types.h -../include-MC/MCCphoton.o: /usr/include/mach/machine/vm_types.h -../include-MC/MCCphoton.o: /usr/include/sys/select.h /usr/include/getopt.h -../include-MC/MCCphoton.o: /usr/include/sys/limits.h -../include-MC/MCCphoton.o: /usr/include/sys/machine/machlimits.h -../include-MC/MCCphoton.o: /usr/include/sys/syslimits.h -../include-MC/MCCphoton.o: /usr/include/sys/machine/machtime.h -../include-MC/MCCphoton.o: /usr/include/sys/rt_limits.h /usr/include/limits.h -../include-MC/MCCphoton.o: /usr/include/memory.h /usr/include/string.h -../include-MC/MCCphoton.o: /usr/include/strings.h /usr/include/cxx/iomanip.h -../include-MC/MCCphoton.o: /usr/include/cxx/iomanip.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/iomanip_impl.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/generic.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/mutex.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/fstream.h -../include-MC/MCCphoton.o: /usr/include/cxx/fstream.hxx -../include-MC/MCCphoton.o: /usr/include/cxx/fstream_impl.hxx -../include-MC/MCCphoton.o: /usr/include/stdlib.h /usr/include/math.h -../include-MC/MCCphoton.o: ../include-GENERAL/jcmacros.h -../include-MTrigger/MTrigger.o: ../include-MTrigger/MTrigger.hxx -../include-MTrigger/MTrigger.o: /usr/include/cxx/iostream.h -../include-MTrigger/MTrigger.o: /usr/include/cxx/iostream.hxx -../include-MTrigger/MTrigger.o: /usr/include/cxx/compnent.hxx -../include-MTrigger/MTrigger.o: /usr/include/cxx/iostream_impl.hxx -../include-MTrigger/MTrigger.o: /usr/include/cxx/cxxl.hxx -../include-MTrigger/MTrigger.o: /usr/include/cxx/cxxl_share.hxx -../include-MTrigger/MTrigger.o: /usr/include/cxx/messages.hxx -../include-MTrigger/MTrigger.o: /usr/include/stddef.h -../include-MTrigger/MTrigger.o: /usr/include/standards.h /usr/include/stdio.h -../include-MTrigger/MTrigger.o: /usr/include/sys/seek.h -../include-MTrigger/MTrigger.o: /usr/include/va_list.h -../include-MTrigger/MTrigger.o: /usr/include/sys/types.h -../include-MTrigger/MTrigger.o: /usr/include/mach/machine/vm_types.h -../include-MTrigger/MTrigger.o: /usr/include/sys/select.h -../include-MTrigger/MTrigger.o: /usr/include/getopt.h -../include-MTrigger/MTrigger.o: /usr/include/sys/limits.h -../include-MTrigger/MTrigger.o: /usr/include/sys/machine/machlimits.h -../include-MTrigger/MTrigger.o: /usr/include/sys/syslimits.h -../include-MTrigger/MTrigger.o: /usr/include/sys/machine/machtime.h -../include-MTrigger/MTrigger.o: /usr/include/sys/rt_limits.h -../include-MTrigger/MTrigger.o: /usr/include/limits.h /usr/include/memory.h -../include-MTrigger/MTrigger.o: /usr/include/string.h /usr/include/strings.h -../include-MTrigger/MTrigger.o: /usr/include/math.h /usr/include/stdlib.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TROOT.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TObject.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TRandom.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TH1.h -../include-MTrigger/MTrigger.o: ../../../include-Classes/Mdefine.h -../include-MTrigger/MTrigger.o: ../../../include-Classes/MMcEvt.h -../include-MTrigger/MTrigger.o: /usr/include/unistd.h -../include-MTrigger/MTrigger.o: /usr/include/sys/access.h -../include-MTrigger/MTrigger.o: /usr/include/fcntl.h /usr/include/sys/fcntl.h -../include-MTrigger/MTrigger.o: /usr/include/sys/mode.h -../include-MTrigger/MTrigger.o: ../include-MTrigger/MTriggerDefine.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TFile.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TObjArray.h -../include-MTrigger/MTrigger.o: ../include-MTrigger/MGTriggerSignal.hxx -../include-MTrigger/MTrigger.o: /CERN/root/include/TApplication.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TVirtualX.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGListBox.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGClient.h -../include-MTrigger/MTrigger.o: /CERN/root/include/GuiTypes.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGFrame.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGIcon.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGLabel.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGButton.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGTextEntry.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGMsgBox.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGMenu.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGCanvas.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGComboBox.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGTab.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGSlider.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGDoubleSlider.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TGFileDialog.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TRootEmbeddedCanvas.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TCanvas.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TH2.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TSystem.h -../include-MTrigger/MTrigger.o: /CERN/root/include/TEnv.h -../include-MTrigger/MGTriggerSignal.o: ../include-MTrigger/MGTriggerSignal.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/stdlib.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/standards.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/getopt.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/types.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/mach/machine/vm_types.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/select.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/iostream.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/iostream.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/compnent.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/iostream_impl.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/cxxl.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/cxxl_share.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/cxx/messages.hxx -../include-MTrigger/MGTriggerSignal.o: /usr/include/stddef.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/stdio.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/seek.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/va_list.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/limits.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/machine/machlimits.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/syslimits.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/machine/machtime.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/rt_limits.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/limits.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/memory.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/string.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/strings.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TROOT.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TApplication.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TVirtualX.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGListBox.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGClient.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/GuiTypes.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGFrame.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGIcon.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGLabel.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGButton.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGTextEntry.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGMsgBox.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGMenu.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGCanvas.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGComboBox.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGTab.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGSlider.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGDoubleSlider.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TGFileDialog.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TRootEmbeddedCanvas.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TCanvas.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TH1.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TH2.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TRandom.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TSystem.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TEnv.h -../include-MTrigger/MGTriggerSignal.o: ../../../include-Classes/MMcEvt.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/unistd.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/access.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/fcntl.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/fcntl.h -../include-MTrigger/MGTriggerSignal.o: /usr/include/sys/mode.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TObject.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TPavesText.h -../include-MTrigger/MGTriggerSignal.o: /CERN/root/include/TObjArray.h -../include-MFadc/MFadc.o: ../include-MFadc/MFadc.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/stream.h -../include-MFadc/MFadc.o: /usr/include/cxx/stream.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/compnent.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/cxxl.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/cxxl_share.hxx -../include-MFadc/MFadc.o: /usr/include/stddef.h /usr/include/standards.h -../include-MFadc/MFadc.o: /usr/include/stdarg.h /usr/include/va_list.h -../include-MFadc/MFadc.o: /usr/include/cxx/iomanip.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/iomanip_impl.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/generic.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/iostream.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/iostream_impl.hxx -../include-MFadc/MFadc.o: /usr/include/cxx/messages.hxx /usr/include/stdio.h -../include-MFadc/MFadc.o: /usr/include/sys/seek.h /usr/include/sys/types.h -../include-MFadc/MFadc.o: /usr/include/mach/machine/vm_types.h -../include-MFadc/MFadc.o: /usr/include/sys/select.h /usr/include/getopt.h -../include-MFadc/MFadc.o: /usr/include/sys/limits.h -../include-MFadc/MFadc.o: /usr/include/sys/machine/machlimits.h -../include-MFadc/MFadc.o: /usr/include/sys/syslimits.h -../include-MFadc/MFadc.o: /usr/include/sys/machine/machtime.h -../include-MFadc/MFadc.o: /usr/include/sys/rt_limits.h /usr/include/limits.h -../include-MFadc/MFadc.o: /usr/include/memory.h /usr/include/string.h -../include-MFadc/MFadc.o: /usr/include/strings.h /usr/include/cxx/mutex.hxx -../include-MFadc/MFadc.o: /usr/include/math.h /usr/include/stdlib.h -../include-MFadc/MFadc.o: /CERN/root/include/TObject.h -../include-MFadc/MFadc.o: /CERN/root/include/TRandom.h -../include-MFadc/MFadc.o: ../../../include-Classes/Mdefine.h -../include-MFadc/MFadc.o: ../include-MTrigger/MTriggerDefine.h -../include-MFadc/MFadc.o: ../../../include-Classes/MMcEvt.h -../include-MFadc/MFadc.o: /usr/include/unistd.h /usr/include/sys/access.h -../include-MFadc/MFadc.o: /usr/include/fcntl.h /usr/include/sys/fcntl.h -../include-MFadc/MFadc.o: /usr/include/sys/mode.h /usr/include/cxx/iostream.h -../include-MFadc/MFadc.o: /CERN/root/include/TROOT.h -../include-MFadc/MFadc.o: /CERN/root/include/TApplication.h -../include-MFadc/MFadc.o: /CERN/root/include/TVirtualX.h -../include-MFadc/MFadc.o: /CERN/root/include/TGClient.h -../include-MFadc/MFadc.o: /CERN/root/include/GuiTypes.h -../include-MFadc/MFadc.o: /CERN/root/include/TH1.h -../include-MFadc/MFadc.o: /CERN/root/include/TObjArray.h -../include-MFadc/MFadc.o: ../include-MFadc/MGFadcSignal.hxx -../include-MFadc/MFadc.o: /CERN/root/include/TGListBox.h -../include-MFadc/MFadc.o: /CERN/root/include/TGFrame.h -../include-MFadc/MFadc.o: /CERN/root/include/TGIcon.h -../include-MFadc/MFadc.o: /CERN/root/include/TGLabel.h -../include-MFadc/MFadc.o: /CERN/root/include/TGButton.h -../include-MFadc/MFadc.o: /CERN/root/include/TGTextEntry.h -../include-MFadc/MFadc.o: /CERN/root/include/TGMsgBox.h -../include-MFadc/MFadc.o: /CERN/root/include/TGMenu.h -../include-MFadc/MFadc.o: /CERN/root/include/TGCanvas.h -../include-MFadc/MFadc.o: /CERN/root/include/TGComboBox.h -../include-MFadc/MFadc.o: /CERN/root/include/TGTab.h -../include-MFadc/MFadc.o: /CERN/root/include/TGSlider.h -../include-MFadc/MFadc.o: /CERN/root/include/TGDoubleSlider.h -../include-MFadc/MFadc.o: /CERN/root/include/TGFileDialog.h -../include-MFadc/MFadc.o: /CERN/root/include/TRootEmbeddedCanvas.h -../include-MFadc/MFadc.o: /CERN/root/include/TCanvas.h -../include-MFadc/MFadc.o: /CERN/root/include/TH2.h -../include-MFadc/MFadc.o: /CERN/root/include/TSystem.h -../include-MFadc/MFadc.o: /CERN/root/include/TEnv.h -../include-MFadc/MGFadcSignal.o: ../include-MFadc/MGFadcSignal.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/stdlib.h -../include-MFadc/MGFadcSignal.o: /usr/include/standards.h -../include-MFadc/MGFadcSignal.o: /usr/include/getopt.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/types.h -../include-MFadc/MGFadcSignal.o: /usr/include/mach/machine/vm_types.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/select.h -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/iostream.h -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/iostream.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/compnent.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/iostream_impl.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/cxxl.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/cxxl_share.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/cxx/messages.hxx -../include-MFadc/MGFadcSignal.o: /usr/include/stddef.h /usr/include/stdio.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/seek.h -../include-MFadc/MGFadcSignal.o: /usr/include/va_list.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/limits.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/machine/machlimits.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/syslimits.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/machine/machtime.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/rt_limits.h -../include-MFadc/MGFadcSignal.o: /usr/include/limits.h /usr/include/memory.h -../include-MFadc/MGFadcSignal.o: /usr/include/string.h /usr/include/strings.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TROOT.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TApplication.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TVirtualX.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGListBox.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGClient.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/GuiTypes.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGFrame.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGIcon.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGLabel.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGButton.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGTextEntry.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGMsgBox.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGMenu.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGCanvas.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGComboBox.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGTab.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGSlider.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGDoubleSlider.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TGFileDialog.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TRootEmbeddedCanvas.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TCanvas.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TH1.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TH2.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TRandom.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TSystem.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TEnv.h -../include-MFadc/MGFadcSignal.o: ../../../include-Classes/MMcEvt.h -../include-MFadc/MGFadcSignal.o: /usr/include/unistd.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/access.h -../include-MFadc/MGFadcSignal.o: /usr/include/fcntl.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/fcntl.h -../include-MFadc/MGFadcSignal.o: /usr/include/sys/mode.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TObject.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TPavesText.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TObjArray.h -../include-MFadc/MGFadcSignal.o: /CERN/root/include/TLine.h -../../../include-Classes/MRawPixel.o: /usr/include/cxx/iostream.h -../../../include-Classes/MRawPixel.o: /usr/include/cxx/iostream.hxx -../../../include-Classes/MRawPixel.o: /usr/include/cxx/compnent.hxx -../../../include-Classes/MRawPixel.o: /usr/include/cxx/iostream_impl.hxx -../../../include-Classes/MRawPixel.o: /usr/include/cxx/cxxl.hxx -../../../include-Classes/MRawPixel.o: /usr/include/cxx/cxxl_share.hxx -../../../include-Classes/MRawPixel.o: /usr/include/cxx/messages.hxx -../../../include-Classes/MRawPixel.o: /usr/include/stddef.h -../../../include-Classes/MRawPixel.o: /usr/include/standards.h -../../../include-Classes/MRawPixel.o: /usr/include/stdio.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/seek.h -../../../include-Classes/MRawPixel.o: /usr/include/va_list.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/types.h -../../../include-Classes/MRawPixel.o: /usr/include/mach/machine/vm_types.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/select.h -../../../include-Classes/MRawPixel.o: /usr/include/getopt.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/limits.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/machine/machlimits.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/syslimits.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/machine/machtime.h -../../../include-Classes/MRawPixel.o: /usr/include/sys/rt_limits.h -../../../include-Classes/MRawPixel.o: /usr/include/limits.h -../../../include-Classes/MRawPixel.o: /usr/include/memory.h -../../../include-Classes/MRawPixel.o: /usr/include/string.h -../../../include-Classes/MRawPixel.o: /usr/include/strings.h -../../../include-Classes/MRawPixel.o: /CERN/root/include/TClonesArray.h -../../../include-Classes/MRawPixel.o: /CERN/root/include/TString.h -../../../include-Classes/MRawPixel.o: /CERN/root/include/TRandom.h -../../../include-Classes/MRawPixel.o: ../../../include-Classes/MRawPixel.h -../../../include-Classes/MRawPixel.o: /CERN/root/include/TObject.h -../../../include-Classes/MRawPixel.o: ../../../include-Classes/Mdefine.h -../../../include-Classes/MRawEvt.o: /usr/include/cxx/iostream.h -../../../include-Classes/MRawEvt.o: /usr/include/cxx/iostream.hxx -../../../include-Classes/MRawEvt.o: /usr/include/cxx/compnent.hxx -../../../include-Classes/MRawEvt.o: /usr/include/cxx/iostream_impl.hxx -../../../include-Classes/MRawEvt.o: /usr/include/cxx/cxxl.hxx -../../../include-Classes/MRawEvt.o: /usr/include/cxx/cxxl_share.hxx -../../../include-Classes/MRawEvt.o: /usr/include/cxx/messages.hxx -../../../include-Classes/MRawEvt.o: /usr/include/stddef.h -../../../include-Classes/MRawEvt.o: /usr/include/standards.h -../../../include-Classes/MRawEvt.o: /usr/include/stdio.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/seek.h -../../../include-Classes/MRawEvt.o: /usr/include/va_list.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/types.h -../../../include-Classes/MRawEvt.o: /usr/include/mach/machine/vm_types.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/select.h -../../../include-Classes/MRawEvt.o: /usr/include/getopt.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/limits.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/machine/machlimits.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/syslimits.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/machine/machtime.h -../../../include-Classes/MRawEvt.o: /usr/include/sys/rt_limits.h -../../../include-Classes/MRawEvt.o: /usr/include/limits.h -../../../include-Classes/MRawEvt.o: /usr/include/memory.h -../../../include-Classes/MRawEvt.o: /usr/include/string.h -../../../include-Classes/MRawEvt.o: /usr/include/strings.h -../../../include-Classes/MRawEvt.o: /CERN/root/include/TClonesArray.h -../../../include-Classes/MRawEvt.o: /CERN/root/include/TString.h -../../../include-Classes/MRawEvt.o: /CERN/root/include/TRandom.h -../../../include-Classes/MRawEvt.o: ../../../include-Classes/MRawEvt.h -../../../include-Classes/MRawEvt.o: /CERN/root/include/TObject.h -../../../include-Classes/MRawEvt.o: ../../../include-Classes/Mdefine.h -../../../include-Classes/MRawEvt.o: ../../../include-Classes/MRawPixel.h -../../../include-Classes/MMcEvt.o: /usr/include/cxx/iostream.h -../../../include-Classes/MMcEvt.o: /usr/include/cxx/iostream.hxx -../../../include-Classes/MMcEvt.o: /usr/include/cxx/compnent.hxx -../../../include-Classes/MMcEvt.o: /usr/include/cxx/iostream_impl.hxx -../../../include-Classes/MMcEvt.o: /usr/include/cxx/cxxl.hxx -../../../include-Classes/MMcEvt.o: /usr/include/cxx/cxxl_share.hxx -../../../include-Classes/MMcEvt.o: /usr/include/cxx/messages.hxx -../../../include-Classes/MMcEvt.o: /usr/include/stddef.h -../../../include-Classes/MMcEvt.o: /usr/include/standards.h -../../../include-Classes/MMcEvt.o: /usr/include/stdio.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/seek.h -../../../include-Classes/MMcEvt.o: /usr/include/va_list.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/types.h -../../../include-Classes/MMcEvt.o: /usr/include/mach/machine/vm_types.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/select.h -../../../include-Classes/MMcEvt.o: /usr/include/getopt.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/limits.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/machine/machlimits.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/syslimits.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/machine/machtime.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/rt_limits.h -../../../include-Classes/MMcEvt.o: /usr/include/limits.h -../../../include-Classes/MMcEvt.o: /usr/include/memory.h -../../../include-Classes/MMcEvt.o: /usr/include/string.h -../../../include-Classes/MMcEvt.o: /usr/include/strings.h -../../../include-Classes/MMcEvt.o: ../../../include-Classes/MMcEvt.h -../../../include-Classes/MMcEvt.o: /usr/include/stdlib.h -../../../include-Classes/MMcEvt.o: /usr/include/unistd.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/access.h -../../../include-Classes/MMcEvt.o: /usr/include/fcntl.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/fcntl.h -../../../include-Classes/MMcEvt.o: /usr/include/sys/mode.h -../../../include-Classes/MMcEvt.o: /CERN/root/include/TObject.h -../../../include-Classes/MMcTrig.o: /usr/include/cxx/iostream.h -../../../include-Classes/MMcTrig.o: /usr/include/cxx/iostream.hxx -../../../include-Classes/MMcTrig.o: /usr/include/cxx/compnent.hxx -../../../include-Classes/MMcTrig.o: /usr/include/cxx/iostream_impl.hxx -../../../include-Classes/MMcTrig.o: /usr/include/cxx/cxxl.hxx -../../../include-Classes/MMcTrig.o: /usr/include/cxx/cxxl_share.hxx -../../../include-Classes/MMcTrig.o: /usr/include/cxx/messages.hxx -../../../include-Classes/MMcTrig.o: /usr/include/stddef.h -../../../include-Classes/MMcTrig.o: /usr/include/standards.h -../../../include-Classes/MMcTrig.o: /usr/include/stdio.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/seek.h -../../../include-Classes/MMcTrig.o: /usr/include/va_list.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/types.h -../../../include-Classes/MMcTrig.o: /usr/include/mach/machine/vm_types.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/select.h -../../../include-Classes/MMcTrig.o: /usr/include/getopt.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/limits.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/machine/machlimits.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/syslimits.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/machine/machtime.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/rt_limits.h -../../../include-Classes/MMcTrig.o: /usr/include/limits.h -../../../include-Classes/MMcTrig.o: /usr/include/memory.h -../../../include-Classes/MMcTrig.o: /usr/include/string.h -../../../include-Classes/MMcTrig.o: /usr/include/strings.h -../../../include-Classes/MMcTrig.o: ../../../include-Classes/MMcTrig.hxx -../../../include-Classes/MMcTrig.o: /usr/include/stdlib.h -../../../include-Classes/MMcTrig.o: /usr/include/unistd.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/access.h -../../../include-Classes/MMcTrig.o: /usr/include/fcntl.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/fcntl.h -../../../include-Classes/MMcTrig.o: /usr/include/sys/mode.h -../../../include-Classes/MMcTrig.o: /CERN/root/include/TObject.h -../../../include-Classes/MMcTrig.o: ../../../Simulation/Detector/include-MTrigger/MTriggerDefine.h creadparam.o: creadparam.h /usr/include/cxx/iostream.h creadparam.o: /usr/include/cxx/iostream.hxx /usr/include/cxx/compnent.hxx @@ -665,14 +229,13 @@ creadparam.o: /usr/include/cxx/fstream.hxx /usr/include/cxx/fstream_impl.hxx creadparam.o: /usr/include/stdlib.h /usr/include/math.h /usr/include/float.h -creadparam.o: /usr/include/fp_class.h ../include-GENERAL/jcmacros.h -creadparam.o: ../include-GENERAL/jcdebug.h camera-v.h +creadparam.o: /usr/include/fp_class.h camera-v.h camera.o: /CERN/root/include/TROOT.h /CERN/root/include/TApplication.h camera.o: /CERN/root/include/TFile.h /CERN/root/include/TTree.h -camera.o: /CERN/root/include/TBranch.h /CERN/root/include/TCanvas.h -camera.o: ../include-MTrigger/MTrigger.hxx /usr/include/cxx/iostream.h -camera.o: /usr/include/cxx/iostream.hxx /usr/include/cxx/compnent.hxx -camera.o: /usr/include/cxx/iostream_impl.hxx /usr/include/cxx/cxxl.hxx -camera.o: /usr/include/cxx/cxxl_share.hxx /usr/include/cxx/messages.hxx -camera.o: /usr/include/stddef.h /usr/include/standards.h /usr/include/stdio.h +camera.o: /CERN/root/include/TBranch.h /CERN/root/include/TCanvas.h camera.h +camera.o: /usr/include/cxx/iostream.h /usr/include/cxx/iostream.hxx +camera.o: /usr/include/cxx/compnent.hxx /usr/include/cxx/iostream_impl.hxx +camera.o: /usr/include/cxx/cxxl.hxx /usr/include/cxx/cxxl_share.hxx +camera.o: /usr/include/cxx/messages.hxx /usr/include/stddef.h +camera.o: /usr/include/standards.h /usr/include/stdio.h camera.o: /usr/include/sys/seek.h /usr/include/va_list.h camera.o: /usr/include/sys/types.h /usr/include/mach/machine/vm_types.h @@ -682,25 +245,9 @@ camera.o: /usr/include/sys/rt_limits.h /usr/include/limits.h camera.o: /usr/include/memory.h /usr/include/string.h /usr/include/strings.h -camera.o: /usr/include/math.h /usr/include/stdlib.h -camera.o: /CERN/root/include/TObject.h /CERN/root/include/TRandom.h -camera.o: /CERN/root/include/TH1.h ../../../include-Classes/Mdefine.h -camera.o: ../../../include-Classes/MMcEvt.h /usr/include/unistd.h -camera.o: /usr/include/sys/access.h /usr/include/fcntl.h -camera.o: /usr/include/sys/fcntl.h /usr/include/sys/mode.h -camera.o: ../include-MTrigger/MTriggerDefine.h ../include-MFadc/MFadc.hxx -camera.o: /usr/include/cxx/stream.h /usr/include/cxx/stream.hxx -camera.o: /usr/include/stdarg.h /usr/include/cxx/iomanip.hxx -camera.o: /usr/include/cxx/iomanip_impl.hxx /usr/include/cxx/generic.hxx -camera.o: /usr/include/cxx/mutex.hxx ../../../include-Classes/MRawEvt.h -camera.o: /CERN/root/include/TClonesArray.h -camera.o: ../../../include-Classes/MMcTrig.hxx -camera.o: ../../../Simulation/Detector/include-MTrigger/MTriggerDefine.h -camera.o: camera.h /usr/include/cxx/fstream.h /usr/include/cxx/fstream.hxx -camera.o: /usr/include/cxx/fstream_impl.hxx /usr/include/dirent.h -camera.o: /usr/include/libgen.h camera-v.h ../include-GENERAL/jcmacros.h -camera.o: ../include-GENERAL/jcdebug.h creadparam.h /usr/include/float.h -camera.o: /usr/include/fp_class.h ../Reflector/atm.h -camera.o: ../Reflector/reflector-v.h moments.h -camera.o: ../include-MC/MCEventHeader.hxx ../include-GENERAL/Rtypes.h -camera.o: /usr/include/cxx/iomanip.h ../include-CORSIKA/COREventHeader.hxx -camera.o: ../include-MC/MCCphoton.hxx ../include-GENERAL/ranlib.h +camera.o: /usr/include/cxx/fstream.h /usr/include/cxx/fstream.hxx +camera.o: /usr/include/cxx/fstream_impl.hxx /usr/include/stdlib.h +camera.o: /usr/include/stdarg.h /usr/include/math.h /usr/include/dirent.h +camera.o: /usr/include/unistd.h /usr/include/sys/access.h +camera.o: /usr/include/libgen.h camera-v.h creadparam.h /usr/include/float.h +camera.o: /usr/include/fp_class.h moments.h /usr/include/ranlib.h +camera.o: /usr/include/ar.h Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (revision 411) +++ trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (revision 435) @@ -21,7 +21,7 @@ // // $RCSfile: camera.cxx,v $ -// $Revision: 1.10 $ -// $Author: MagicSol $ -// $Date: 2000-07-04 14:10:20 $ +// $Revision: 1.11 $ +// $Author: harald $ +// $Date: 2000-09-21 11:47:33 $ // //////////////////////////////////////////////////////////////////////// @@ -62,4 +62,5 @@ #include "MMcEvt.h" #include "MMcTrig.hxx" +#include "MHeaderTrig.hxx" /*!@" @@ -437,7 +438,11 @@ int ntrigger = 0; //@< number of triggers in the whole file + int btrigger = 0; //@< trigger flag int ithrescount; //@< counter for loop over threshold trigger int imulticount; //@< counter for loop over multiplicity trigger int itopocount; //@< counter for loop over topology trigger + int icontrigger; //@< number of trigger conditions to be analised + UShort_t numPix; //@< number of sets of fadc written counts + float fpixelthres[TRIGGER_PIXELS]; @@ -533,6 +538,11 @@ Trigger_Loop = get_Trigger_Loop(&Trigger_loop_lthres, &Trigger_loop_uthres, &Trigger_loop_lmult, &Trigger_loop_umult, &Trigger_loop_ltop, &Trigger_loop_utop); + icontrigger =(Trigger_loop_uthres-Trigger_loop_lthres+1)* + (Trigger_loop_umult-Trigger_loop_lmult+1)* + (Trigger_loop_utop-Trigger_loop_ltop+1); + if (!Trigger_Loop){ get_Trigger_Single (&Trigger_threshold, &Trigger_multiplicity, &Trigger_topology); + icontrigger=1; } @@ -675,5 +685,23 @@ MTrigger Trigger(Trigger_gate_length, Trigger_response_ampl, Trigger_response_fwhm); //@< A instance of the Class MTrigger - MMcTrig *McTrig = new MMcTrig() ; + // Initialise McTrig information class if we want to save trigger informtion + + MMcTrig **McTrig; + MHeaderTrig **HeaderTrig; + + if (Write_McTrig){ + + McTrig = new MMcTrig * [icontrigger]; + + for (i=0;iSetTopology((Short_t) Trigger_topology); + HeaderTrig[0]->SetMultiplicity((Short_t) Trigger_multiplicity); + for(i=0;iSetThreshold( fpixelthres); + + } + if(Trigger_Loop && Write_McTrig){ + + for (int iconcount=0,ithrescount=0;ithrescount<=Trigger_loop_uthres-Trigger_loop_lthres;ithrescount++){ + for (imulticount=0;imulticount<=Trigger_loop_umult-Trigger_loop_lmult;imulticount++){ + for(itopocount=0;itopocount<=Trigger_loop_utop-Trigger_loop_ltop;itopocount++){ + HeaderTrig[iconcount]->SetTopology((Short_t) itopocount+Trigger_loop_ltop); + HeaderTrig[iconcount]->SetMultiplicity((Short_t) imulticount+Trigger_loop_lmult); + for(i=0;iSetThreshold( fpixelthres); + iconcount++; + } + } + } + } + + // Fill the Header Tree with the current leaves of each branch + HeaderTree.Fill() ; + + // create a Tree for the Event data stream TTree EvtTree("EvtTree","Events of Run"); - Int_t bsize=128000; Int_t split=1; + if (Write_McEvt){ + + EvtTree.Branch("MMcEvt","MMcEvt", + &McEvt, bsize, split); + } if(!Trigger_Loop){ - EvtTree.Branch("MRawEvt","MRawEvt", - &Evt, bsize, split); - } - - EvtTree.Branch("MMcEvt","MMcEvt", - &McEvt, bsize, split); - - EvtTree.Branch("MMcTrig","MMcTrig", - &McTrig, bsize, split); - - - // create a Tree for the Event data stream - TTree EvtTree_loop("EvtTree","Events of Run"); + if (Write_RawEvt){ + EvtTree.Branch("MRawEvt","MRawEvt", + &Evt[0], bsize, split); + } + if (Write_McTrig){ + EvtTree.Branch("MMcTrig","MMcTrig", + &McTrig[0], bsize, split); + } + } + else{ + if (Write_McTrig){ + for(char branchname[10],i=0;i0 || Write_All_Images){ - Lev1=Lev2=0; - + if (Lev0>0 || Write_All_Images || btrigger){ + // loop over topologies for(itopocount=Trigger_loop_ltop;itopocount<=Trigger_loop_utop;itopocount++){ + Lev1=Lev2=0; + if(itopocount==0 && imulticount>7) continue; if(itopocount==2 && imulticount<3) continue; Trigger.SetTopology(itopocount); Trigger.ClearFirst(); - + // // Start the First Level Trigger simulation // - McTrig->SetFirstLevel (Lev1=Trigger.FirstLevel()); + Lev1=Trigger.FirstLevel(); + if (Write_McTrig) + McTrig[iconcount]->SetFirstLevel (Lev1); if(Lev1>0) { + btrigger= 1; ntriggerloop[ithrescount-Trigger_loop_lthres][imulticount-Trigger_loop_lmult][itopocount-Trigger_loop_ltop]++; - McTrig->SetTopology(itopocount); - McTrig->SetMultiplicity(imulticount); - McTrig->SetThreshold(fpixelthres); } - if(Lev1==0 && Write_All_Images){ - McTrig->SetTopology(itopocount); - McTrig->SetMultiplicity(imulticount); - McTrig->SetThreshold(fpixelthres); + + if(Lev1==0 && (Write_All_Images || btrigger)){ + btrigger= 1; Lev1=1; } + numPix=0; for (Int_t ii=0;iiSetTime(Trigger.GetFirstLevelTime(ii)); - McTrig->SetPixel(Trigger.GetFirstLevelPixel(ii)); + if (Write_McTrig) + McTrig[iconcount]->SetTime(Trigger.GetFirstLevelTime(ii),ii+1); + if (Write_McTrig) + McTrig[iconcount]->SetPixel(Trigger.GetFirstLevelPixel(ii),ii+1); + + // + // fill inside the class fadc the member output + // + fadc.TriggeredFadc(Trigger.GetFirstLevelTime(ii)); - - // fill pixel information - - for(i=0;iFillHeader ( (UShort_t) (ntshow + nshow) , 20 ) ; - + Evt[iconcount]->FillHeader ( (UInt_t) (ntshow + nshow),(Float_t) (nshow*10000+iconcount*100+ii),0 ); // fill pixel information - - Evt->FillPixel(i,fadcValues); - - // - // fill the MMcEvt with all information - // - - McEvt->Fill( (UShort_t) mcevth.get_primary() , - mcevth.get_energy(), - mcevth.get_theta(), - mcevth.get_phi(), - mcevth.get_core(), - mcevth.get_coreX(), - mcevth.get_coreY(), - impactD, - ulli, ulli, - (UShort_t) ncph, - ulli, - (UShort_t) ncph) ; - // We don not count phtons out of the camera. - - // - // write it out to the file outfile - // - - EvtTree_loop.Fill() ; - - // clear all - Evt->Clear() ; - McEvt->Clear() ; + for(i=0;iFillPixel(i+1000*ii,&numPix,fadcValues); + } } } // - // fill the MMcEvt with all information + // Increase counter of analised trigger conditions // - - McEvt->Fill( (UShort_t) mcevth.get_primary() , - mcevth.get_energy(), - mcevth.get_theta(), - mcevth.get_phi(), - mcevth.get_core(), - mcevth.get_coreX(), - mcevth.get_coreY(), - impactD, - ulli, ulli, - (UShort_t) ncph, - ulli, - (UShort_t) ncph) ; - - EvtTree.Fill() ; - - McTrig->Clear() ; + iconcount++; } } - else break; + else{ + break; + } } + if (!btrigger) break; + } + if (btrigger){ + + // + // fill the MMcEvt with all information + // + + if (Write_McEvt) { + McEvt->Fill( (UShort_t) mcevth.get_primary() , + mcevth.get_energy(), + mcevth.get_theta(), + mcevth.get_phi(), + mcevth.get_core(), + mcevth.get_coreX(), + mcevth.get_coreY(), + impactD, + ulli, ulli, + (UShort_t) ncph, + ulli, + (UShort_t) ncph) ; + } + // Fill the Tree with the current leaves of each branch + i=EvtTree.Fill() ; + + // Clear the branches + if(Write_McTrig){ + for(i=0;iClear() ; + } + } + if( Write_RawEvt ){ + for(i=0;iClear() ; + } + } + if (Write_McEvt) + McEvt->Clear() ; } } @@ -1245,5 +1344,7 @@ if ( Lev0 > 0 || Write_All_Images) { - McTrig->SetFirstLevel (Lev1= Trigger.FirstLevel()); + Lev1= Trigger.FirstLevel(); + if (Write_McTrig) + McTrig[0]->SetFirstLevel (Lev1); } if (Lev1>0){ @@ -1253,49 +1354,57 @@ Lev1=1; } - McTrig->SetTopology(Trigger.GetTopology()); - McTrig->SetMultiplicity(Trigger.GetMultiplicity()); - for(i=0;iSetThreshold(fpixelthres); - + + numPix=0; for(Int_t ii=0;iiSetTime(Trigger.GetFirstLevelTime(ii)); - McTrig->SetPixel(Trigger.GetFirstLevelPixel(ii)); - - // - // Fill the header of this event - // - - Evt->FillHeader ( (UShort_t) (ntshow + nshow) , 20 ) ; - - // fill pixel information - - for(i=0;iSetTime(Trigger.GetFirstLevelTime(ii),ii+1); + + if (Write_McTrig) + McTrig[0]->SetPixel(Trigger.GetFirstLevelPixel(ii),ii+1); + + // Fill Evt information + + if (Write_RawEvt){ + + // + // Fill the header of this event + // + + Evt[0]->FillHeader ( (UShort_t) (ntshow + nshow) , 20 ) ; + + // fill pixel information + + for(i=0;iFillPixel(i,&numPix,fadcValues); } - Evt->FillPixel(i,fadcValues); - } - + } // // fill the MMcEvt with all information // - McEvt->Fill( (UShort_t) mcevth.get_primary() , - mcevth.get_energy(), - mcevth.get_theta(), - mcevth.get_phi(), - mcevth.get_core(), - mcevth.get_coreX(), - mcevth.get_coreY(), - impactD, - ulli, ulli, - (UShort_t) ncph, - ulli, - (UShort_t) ncph) ; - + if (Write_McEvt){ + McEvt->Fill( (UShort_t) mcevth.get_primary() , + mcevth.get_energy(), + mcevth.get_theta(), + mcevth.get_phi(), + mcevth.get_core(), + mcevth.get_coreX(), + mcevth.get_coreY(), + impactD, + ulli, ulli, + (UShort_t) ncph, + ulli, + (UShort_t) ncph) ; + } // We don not count photons out of the camera. @@ -1327,8 +1436,8 @@ // clear all - Evt->Clear() ; - McEvt->Clear() ; + if (Write_RawEvt) Evt[0]->Clear() ; + if (Write_McEvt) McEvt->Clear() ; } - McTrig->Clear() ; + if (Write_McTrig) McTrig[0]->Clear() ; } @@ -1383,5 +1492,5 @@ log(SIGNATURE, "End of file . . .\n"); still_in_loop = FALSE; - + if ((! Data_From_STDIN) && ( !feof(inputfile) )){ @@ -1394,9 +1503,9 @@ } + + fread( flag, SIZE_OF_FLAGS, 1, inputfile ); } // end if found end of file } // end if found end of run - - fread( flag, SIZE_OF_FLAGS, 1, inputfile ); } // end if else found start of run @@ -1407,4 +1516,5 @@ //-- + HeaderTree.Write() ; EvtTree.Write() ; outfile_temp.Write() ; @@ -1416,18 +1526,9 @@ TFile outfile ( rootname , "RECREATE" ); + HeaderTree.Write() ; EvtTree.Write() ; outfile.Write() ; outfile.Close() ; - if(Trigger_Loop && Write_RawEvt){ - //++ - // put the Event to the special root file - //-- - TFile outfile_loop( rootname_loop , "RECREATE" ); - EvtTree_loop.Write() ; - outfile_loop.Write() ; - - outfile_loop.Close() ; - } // close input file @@ -2352,5 +2453,6 @@ b = pcam->dpixdiameter_cm / 2. * pcam->dpixsizefactor[ipixnum]; a = pcam->dpixdiameter_cm / sqrt(3.) * pcam->dpixsizefactor[ipixnum]; - c = 1. - 1./sqrt(3.); + c = 1./sqrt(3.); + if((ipixnum < 0)||(ipixnum >= pcam->inumpixels)){ fprintf(stderr, "Error in bpoint_is_in_pix: invalid pixel number %d\n", ipixnum); @@ -2543,5 +2645,5 @@ cx = photon.get_x(); cy = photon.get_y(); - + // get wavelength @@ -2573,5 +2675,5 @@ } } - + if(ipixnum==-1){// the photon is in none of the pixels @@ -2585,5 +2687,13 @@ continue; } - + + if(ipixnum==0) {// the phton is in the central pixel, which is not used for trigger + // read next CPhoton + + fread ( flag, SIZE_OF_FLAGS, 1, sp ); + + // go to beginning of loop, the photon is lost + continue; + } //+++ // QE simulation @@ -2596,4 +2706,5 @@ // check if wl is inside table; outside the table, QE is assumed to be zero + if((wl < qept[0][0]) || (wl > qept[0][pointsQE-1])){ @@ -2619,11 +2730,11 @@ qe = lin_interpol(qept[0][k-1], qept[1][k-1], qept[0][k], qept[1][k], wl) / 100.0; - + // if random > quantum efficiency, reject it - - if ( RandomNumber > qe ) { + + if ( (RandomNumber) > qe ) { // cout << " lost\n"; - + // read next Photon @@ -2955,4 +3066,11 @@ // // $Log: not supported by cvs2svn $ +// Revision 1.10 2000/07/04 14:10:20 MagicSol +// Some changes have been done in the root output file. The RawEvt tree is only +// stored in the single trigger mode. +// The trigger input parameters are also given by the general input card. +// The diffuse NSB and the star NSB have been decoupled. Now the contribution of +// each one can be studied seperately. +// // Revision 1.9 2000/06/13 13:25:24 blanch // The multiple arrays have been replaced, since they do not work Index: trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx (revision 411) +++ trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx (revision 435) @@ -19,7 +19,7 @@ //= //= $RCSfile: creadparam.cxx,v $ -//= $Revision: 1.5 $ -//= $Author: MagicSol $ -//= $Date: 2000-07-04 14:13:02 $ +//= $Revision: 1.6 $ +//= $Author: harald $ +//= $Date: 2000-09-21 11:47:33 $ //= //=////////////////////////////////////////////////////////////////////// @@ -89,5 +89,5 @@ static int Write_All_Images = FALSE; static int Write_McEvt = TRUE; -static int Write_McTrig = TRUE; +static int Write_McTrig = FALSE; static int Write_RawEvt = FALSE; static int Write_All_Data = FALSE; @@ -245,5 +245,4 @@ // get value of (in photons) sscanf(line, "%s %f", token, &meanNSB); - simulateNSB = TRUE; break; @@ -412,4 +411,5 @@ // change boolean value Trigger_Loop = TRUE; + Write_RawEvt = FALSE; break; @@ -422,4 +422,5 @@ // change boolean value Trigger_Loop = FALSE; + Write_RawEvt = TRUE; break; @@ -1058,4 +1059,8 @@ // // $Log: not supported by cvs2svn $ +// Revision 1.5 2000/07/04 14:13:02 MagicSol +// It reads from the general input card the parameters for the +// trigger analysi. +// // Revision 1.4 2000/05/11 14:22:33 blanch // New input card option has been introduced: Index: trunk/MagicSoft/Simulation/Detector/Camera/input.card =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/input.card (revision 411) +++ trunk/MagicSoft/Simulation/Detector/Camera/input.card (revision 435) @@ -1,14 +1,14 @@ camera 0.3 # Reflector file that the program reads -input_file /hdb1/users/blanch/Ref_pro/prova.rfl +input_file /hd02/Maggi/RefData/prot_15.rfl # # Reflector format file that gives the NSB from the stars -starfield_file /hdb1/users/blanch/Starfield/Ref_stf1 +#starfield_file /hdb1/users/blanch/Starfield/Ref_stf1 # # Output file with a brief summary about trigger -data_file /hdb1/users/blanch/test.dat +data_file test.dat # # Root file with the output information -root_file /hdb1/users/blanch/Cam_test.root +root_file Cam_test.root # # Information about the telescope @@ -17,8 +17,8 @@ # Diskriminator and response properties (gate_lentgh, amplitude and fwhm) # needed for the trigger studies -trigger_prop 3.0 1.0 2.0 +trigger_prop 6.0 1.0 2.0 # # Trigger loop mode (theshold, multiplicity and topology) -trigger_loop 0 2 4 4 1 1 +trigger_loop 4 4 4 4 0 2 # # Single trigger mode (theshold, multiplicity and topology) @@ -28,6 +28,12 @@ #write_all_images # +# Do not write Mc information +# nowrite_McEvt +# +# Write Mc trigger information +write_McTrig +# # Analised pixels -ana_pixels 595 +ana_pixels 577 # # Switch on NSB @@ -37,5 +43,5 @@ nsb_off # Number of photon from the diffuse NSB -nsb_mean 0.09 +#nsb_mean 0.9 # # Show signal of diskriminator on the screen