From be64fa2880fa09965998ff7c8e2947456e5ea759 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Thu, 17 Feb 2011 20:35:50 +0000
Subject: [PATCH] * Changing trigger threshold for MUST2
---
NPAnalysis/RRC66/Analysis.cxx | 14 +++++++++-----
NPAnalysis/RRC66/Analysis.h | 12 +++---------
NPSimulation/include/Must2Scorers.hh | 3 +++
NPSimulation/src/Must2Scorers.cc | 6 +++---
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/NPAnalysis/RRC66/Analysis.cxx b/NPAnalysis/RRC66/Analysis.cxx
index 55fa585c7..a1fd58ebb 100644
--- a/NPAnalysis/RRC66/Analysis.cxx
+++ b/NPAnalysis/RRC66/Analysis.cxx
@@ -69,13 +69,12 @@ int main(int argc, char** argv)
}
// Attach new branch
- Float_t Energy_Must2 = 0 ;
- Float_t Energy_SSSD = 0;
- RootOutput::getInstance()->GetTree()->Branch("Energy_Must2",&Energy_Must2,"Energy_Must2/F");
- RootOutput::getInstance()->GetTree()->Branch("Energy_SSSD",&Energy_SSSD,"Energy_SSSD/F");
+ InitOutputBranch();
+
////////////////////////////////////////////////////////
// Get pointer to the different detector
+
TMust2Physics* M2 = (TMust2Physics*) myDetector -> GetDetector("MUST2");
TSSSDPhysics* SSSD = (TSSSDPhysics*) myDetector -> GetDetector("SSSD");
@@ -132,4 +131,9 @@ int main(int argc, char** argv)
return 0 ;
}
-
+////////////////////////////////////////////////////////////////////////////////////////////////////
+void InitOutputBranch()
+ {
+ RootOutput::getInstance()->GetTree()->Branch("Energy_Must2",&Energy_Must2,"Energy_Must2/F");
+ RootOutput::getInstance()->GetTree()->Branch("Energy_SSSD",&Energy_SSSD,"Energy_SSSD/F");
+ }
diff --git a/NPAnalysis/RRC66/Analysis.h b/NPAnalysis/RRC66/Analysis.h
index bee3f4b78..daa259cb4 100644
--- a/NPAnalysis/RRC66/Analysis.h
+++ b/NPAnalysis/RRC66/Analysis.h
@@ -43,16 +43,15 @@
// ----------------------------------------------------------------------------------------------
-double ThetaCalculation (TVector3 A , TVector3 B) ;
+void InitOutputBranch() ;
/////////////////////////////////////////////////////////////////////////////////////////////////
// ----------------------------------- DOUBLE, INT, BOOL AND MORE -------------------------------
namespace VARIABLE
{
// Declare your Variable here:
- double X1,Y1,Z1 ;
- int N1,N2 = 0 ;
- bool check= false ;
+ Float_t Energy_Must2 = 0 ;
+ Float_t Energy_SSSD = 0;
// A Usefull Simple Random Generator
TRandom Rand;
@@ -75,11 +74,6 @@ using namespace VARIABLE ;
namespace GRAPH
{
// Declare your Spectra here:
-
- TH1F *myHist1D = new TH1F("Hist1D","Histogramm 1D ; x ; count", 1000 , -5 , 5 ) ;
-
- TH2F *myHist2D = new TH2F("Hist2D","Histogramm 2D ; x ; y ", 128 , 1 , 128 , 128 , 1 , 128 ) ;
-
}
using namespace GRAPH ;
diff --git a/NPSimulation/include/Must2Scorers.hh b/NPSimulation/include/Must2Scorers.hh
index a5e1ebea6..18413b3a8 100644
--- a/NPSimulation/include/Must2Scorers.hh
+++ b/NPSimulation/include/Must2Scorers.hh
@@ -27,6 +27,9 @@
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
namespace MUST2 {
+ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+ // This Threshold is used in the above scorer. Any energy deposit under this threshold will not create an entry.
+ const double TriggerThreshold = 0.1*keV ;
class PSStripNumberX : public G4VPrimitiveScorer
{
diff --git a/NPSimulation/src/Must2Scorers.cc b/NPSimulation/src/Must2Scorers.cc
index d5551cdd9..d00f95e7a 100644
--- a/NPSimulation/src/Must2Scorers.cc
+++ b/NPSimulation/src/Must2Scorers.cc
@@ -57,7 +57,7 @@ G4bool PSStripNumberX::ProcessHits(G4Step* aStep, G4TouchableHistory*)
//Rare case where particle is close to edge of silicon plan
if (X == m_NumberOfStrip+1) X = m_NumberOfStrip;
G4double edep = aStep->GetTotalEnergyDeposit();
- if (edep < 100*keV) return FALSE;
+ if (edep < TriggerThreshold) return FALSE;
G4int index = aStep->GetTrack()->GetTrackID();
EvtMap->set(index+DetNbr, X);
return TRUE;
@@ -125,7 +125,7 @@ G4bool PSStripNumberY::ProcessHits(G4Step* aStep, G4TouchableHistory*)
if (Y == m_NumberOfStrip+1) Y = m_NumberOfStrip;
G4double edep = aStep->GetTotalEnergyDeposit();
- if (edep < 100*keV) return FALSE;
+ if (edep < TriggerThreshold) return FALSE;
G4int index = aStep->GetTrack()->GetTrackID();
EvtMap->set(index+DetNbr, Y);
return TRUE;
@@ -200,7 +200,7 @@ G4bool PSPadOrCristalNumber::ProcessHits(G4Step* aStep, G4TouchableHistory*)
G4int DetNbr = GENERALSCORERS::PickUpDetectorNumber(aStep, "MUST2Telescope");
G4double edep = aStep->GetTotalEnergyDeposit();
- if (edep < 100*keV) return FALSE;
+ if (edep < TriggerThreshold) return FALSE;
G4int index = aStep->GetTrack()->GetTrackID();
EvtMap->set(index+DetNbr, VolumeNumber);
return TRUE;
--
GitLab