diff --git a/Inputs/DetectorConfiguration/Riken_30mm.detector b/Inputs/DetectorConfiguration/Riken_30mm.detector
deleted file mode 100644
index 9b4ab4aec4e3b209c26c16fe6df7bf8603191609..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/Riken_30mm.detector
+++ /dev/null
@@ -1,121 +0,0 @@
-%%%%%%%%%%%Target%%%%%%%%%%%%%%%%%%%1
-%Thickness in micrometer
-%Radius in mm
-%Temperature in K, Pressure in bar
-%Material name according to the target library
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GeneralTarget
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%Target
- THICKNESS= 1
- RADIUS= 45
- MATERIAL= CD2
- X= 0
- Y= 0
- Z= 0
-
-CryoTarget
- THICKNESS= 3
- RADIUS= 45
- TEMPERATURE= 26
- PRESSURE= 1
- MATERIAL= D2
- WINDOWSTHICKNESS= 0
- WINDOWSMATERIAL= Mylar
- X= 0
- Y= 0
- Z= 0
-
-
-%%%%%%%%%%%%%%%%%%%%%
-MUST2Array
-%%%%%%% Telescope 1 %%%%%%%
-M2Telescope
-X1_Y1= 10.85 105.03 146.16
-X1_Y128= 22.8 9.84 175.95
-X128_Y1= 104.09 105.03 108.76
-X128_Y128= 116.04 9.84 138.55
-SI= 1
-SILI= 0
-CSI= 1
-VIS= all
-
-%%%%%%% Telescope 2 %%%%%%%
-M2Telescope
-X1_Y1= -116.04 9.84 138.55
-X1_Y128= -22.8 9.84 175.95
-X128_Y1= -104.09 105.03 108.76
-X128_Y128= -10.85 105.03 146.16
-SI= 1
-SILI= 0
-CSI= 1
-VIS= all
-
-%%%%%%% Telescope 3 %%%%%%%
-M2Telescope
-X1_Y1= -10.85 -105.03 146.16
-X1_Y128= -22.8 -9.84 175.95
-X128_Y1= -104.09 -105.03 108.76
-X128_Y128= -116.04 -9.84 138.55
-SI= 1
-SILI= 0
-CSI= 1
-VIS= all
-
-%%%%%%% Telescope 4 %%%%%%%
-M2Telescope
-X1_Y1= 116.04 -9.84 138.55
-X1_Y128= 22.8 -9.84 175.95
-X128_Y1= 104.09 -105.03 108.76
-X128_Y128= 10.85 -105.03 146.16
-SI= 1
-SILI= 0
-CSI= 1
-VIS= all
-
-%%%%%%% Telescope 5 %%%%%%%
-M2Telescope
-X1_Y1= -50.23 -50.23 325
-X1_Y128= 50.23 -50.23 325
-X128_Y1= -50.23 50.23 325
-X128_Y128= 50.23 50.23 325
-SI= 1
-SILI= 0
-CSI= 1
-VIS= all
-
-%%%%%%%%%%%%%%%%%%%%
-AddThinSi
-%%%%%%%%% Det 1 %%%%%%%%
-ThinSi
-A= 18.39 9.66 143.67
-B= 65.26 9.66 124.87
-C= 59.44 56.09 110.34
-D= 12.57 56.09 129.14
-
-%%%%%%%%% Det 2 %%%%%%%%
-ThinSi
-A= -12.57 56.09 129.14
-B= -59.44 56.09 110.34
-C= -65.26 9.66 124.87
-D= -18.39 9.66 143.67
-
-%%%%%%%%% Det 3 %%%%%%%%
-ThinSi
-A= -18.39 -9.66 143.67
-B= -65.26 -9.66 124.87
-C= -59.44 -56.09 110.34
-D= -12.57 -56.09 129.14
-
-%%%%%%%%% Det 4 %%%%%%%%
-ThinSi
-A= 12.57 -56.09 129.14
-B= 59.44 -56.09 110.34
-C= 65.26 -9.66 124.87
-D= 18.39 -9.66 143.67
-
-
-
-
-
diff --git a/Inputs/EventGenerator/10Li-dp.reaction b/Inputs/EventGenerator/10Li-dp.reaction
deleted file mode 100644
index 7da31ea77506542ce763e9ef0b220c5510c64763..0000000000000000000000000000000000000000
--- a/Inputs/EventGenerator/10Li-dp.reaction
+++ /dev/null
@@ -1,21 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm
-% SigmaThetaX/PhiY in deg
-Transfert
- Beam= 9Li
- Target= 2H
- Light= 1H
- Heavy= 10Li
- ExcitationEnergy= 0.0
- BeamEnergy= 450
- BeamEnergySpread= 0
- SigmaThetaX= 0.6921330164
- SigmaPhiY= 0.963142053
- SigmaX= 6.232
- SigmaY= 9.069
- CrossSectionPath= 9Li(d,p).txt
- ShootLight= 1
- ShootHeavy= 0
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/EventGenerator/11Li.reaction b/Inputs/EventGenerator/11Li.reaction
deleted file mode 100644
index 61c6bc4d4090ca126a27d674352baab481d20a98..0000000000000000000000000000000000000000
--- a/Inputs/EventGenerator/11Li.reaction
+++ /dev/null
@@ -1,21 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm
-% SigmaThetaX/PhiY in deg
-Transfert
- Beam= 11Li
- Target= 2H
- Light= 2H
- Heavy= 11Li
- ExcitationEnergy= 1.0
- BeamEnergy= 550
- BeamEnergySpread= 0
- SigmaThetaX= 0.6921330164
- SigmaPhiY= 0.963142053
- SigmaX= 6.232
- SigmaY= 9.069
- CrossSectionPath= flat.txt
- ShootLight= 1
- ShootHeavy= 0
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index f0612a01b99c8a28060b8aa7d3b0266620d96a3a..3982fcb770c183f6a28175832cf1a864a15b1c68 100755
Binary files a/NPAnalysis/10He_Riken/Analysis and b/NPAnalysis/10He_Riken/Analysis differ
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index 4009505cb2da39ef76bd6f432c6c1ad4833ee3b0..a6b9838272512af38b56e9e6855c54858f74779c 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -118,7 +118,7 @@ int main(int argc,char** argv)
- // Target (from initial condition)
+/* // Target (from initial condition)
XTarget = Init->GetICPositionX(0);
YTarget = Init->GetICPositionY(0);
// XTarget = RandomEngine.Gaus(Init->GetICPositionX(0),1);
@@ -253,7 +253,7 @@ int main(int argc,char** argv)
if(Plastic->GetPlasticNumber(yy)==1) EPl1[yy]=Plastic->GetEnergy(yy);
else if(Plastic->GetPlasticNumber(yy)==2) EPl2[yy]=Plastic->GetEnergy(yy);
- }
+ }*/
RootOutput::getInstance()->GetTree()->Fill() ;
}
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index cc80bbdf4905c27e2d028b6e6d6c14fb3a635f22..50cacde5510d67dce519fbacff4e6a2a8eafee9b 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -49,6 +49,83 @@ void TMust2Physics::BuildSimplePhysicalEvent(TMust2Data* Data)
}
///////////////////////////////////////////////////////////////////////////
+
+void TMust2Physics::BuildPhysicalEvent(TMust2Data* Data)
+ {
+ if( CheckEvent(Data) == 1 )
+ {
+ vector< TVector2 > couple = Match_X_Y(Data) ;
+
+ for(unsigned int i = 0 ; i < couple.size() ; i++)
+ {
+ int N = Data->GetMMStripXEDetectorNbr(couple[i].X()) ;
+ int X = Data->GetMMStripXEStripNbr(couple[i].X()) ;
+ int Y = Data->GetMMStripXEStripNbr(couple[i].Y()) ;
+
+ double Si_X_E = Data->GetMMStripXEEnergy(couple[i].X()) ;
+ double Si_Y_E = Data->GetMMStripYEEnergy(couple[i].Y()) ;
+
+ double Si_X_T = Data->GetMMStripXTTime(couple[i].X()) ;
+ double Si_Y_T = Data->GetMMStripYTTime(couple[i].Y()) ;
+
+ Si_X.push_back(X) ; Si_Y.push_back(Y) ; TelescopeNumber.push_back(N) ;
+
+ // Take maximum Energy
+ if(Si_X_E >= Si_Y_E) Si_E.push_back(Si_X_E) ;
+ else Si_E.push_back(Si_Y_E) ;
+
+ // Take minimum Time
+ if(Si_X_T >= Si_Y_T) Si_T.push_back(Si_Y_T) ;
+ else Si_T.push_back(Si_X_T) ;
+
+ for(unsigned int j = 0 ; j < Data->GetMMSiLiEMult() ; j++)
+ {
+ if(Data->GetMMSiLiEDetectorNbr(j)==N)
+ {
+ if( Match_Si_SiLi( X, Y , Data->GetMMSiLiEPadNbr(j) ) )
+ {
+ SiLi_N.push_back(Data->GetMMSiLiEPadNbr(j)) ;
+ SiLi_E.push_back(Data->GetMMSiLiEEnergy(j)) ;
+ SiLi_T.push_back(Data->GetMMSiLiTTime(j)) ;
+ }
+
+ }
+
+ }
+
+
+ for( int j = 0 ; j < Data->GetMMCsIEMult() ; j++)
+ {
+ if(Data->GetMMCsIEDetectorNbr(j)==N)
+ {
+ if( Match_Si_CsI( X, Y , Data->GetMMCsIECristalNbr(j) ) )
+ {
+ CsI_N.push_back(Data->GetMMCsIECristalNbr(j)) ;
+ CsI_E.push_back(Data->GetMMCsIEEnergy(j)) ;
+ CsI_T.push_back(Data->GetMMCsITTime(j)) ;
+ }
+ }
+
+ }
+
+
+ }
+
+ }
+
+ return;
+
+ }
+
+
+
+
+
+
+
+
+ /*
+///////////////////////////////////////////////////////////////////////////
void TMust2Physics::BuildPhysicalEvent(TMust2Data* Data)
{
// Check
@@ -59,7 +136,7 @@ void TMust2Physics::BuildPhysicalEvent(TMust2Data* Data)
{
if( //Same detector
- Data->GetMMStripXEDetectorNbr(0) == Data->GetMMStripXTDetectorNbr(0)
+ Data->GetMMStripXEDetectorNbr(0) == Data->GetMMStripXTDetectorNbr(0)
&& Data->GetMMStripXTDetectorNbr(0) == Data->GetMMStripYTDetectorNbr(0)
&& Data->GetMMStripYTDetectorNbr(0) == Data->GetMMStripYEDetectorNbr(0)
@@ -287,7 +364,7 @@ void TMust2Physics::BuildPhysicalEvent(TMust2Data* Data)
}
}
-
+*/
///////////////////////////////////////////////////////////////////////////
int TMust2Physics :: CheckEvent(TMust2Data* Data)
{
@@ -337,100 +414,100 @@ vector < TVector2 > TMust2Physics :: Match_X_Y(TMust2Data* Data)
bool TMust2Physics :: Match_Si_SiLi(int X, int Y , int PadNbr)
{
if( PadNbr == 1
- && X<128 && X>96
- && Y<128 && Y>96 )
+ && X<121 && X>93
+ && Y<128 && Y>95 )
return true ;
else if( PadNbr == 2
- && X<128 && X>96
- && Y<96 && Y>64 )
+ && X<121 && X>93
+ && Y<100 && Y>65 )
return true ;
else if( PadNbr == 3
- && X<96 && X>64
- && Y<128 && Y>96 )
+ && X<96 && X>61
+ && Y<128 && Y>95 )
return true ;
else if( PadNbr == 4
- && X<96 && X>64
- && Y<96 && Y>64 )
+ && X<96 && X>61
+ && Y<100 && Y>65 )
return true ;
else if( PadNbr == 5
- && X<64 && X>32
- && Y<96 && Y>64)
+ && X<67 && X>30
+ && Y<100 && Y>65)
return true ;
else if( PadNbr == 6
- && X<64 && X>32
- && Y<128 && Y>96 )
+ && X<67 && X>30
+ && Y<128 && Y>95 )
return true ;
else if( PadNbr == 7
- && X<32 && X>1
- && Y<96 && Y>64 )
+ && X<35 && X>6
+ && Y<100 && Y>65 )
return true ;
else if( PadNbr == 8
- && X<32 && X>1
- && Y<128 && Y>96 )
+ && X<35 && X>6
+ && Y<128 && Y>95 )
return true ;
else if( PadNbr == 9
- && X<128 && X>96
- && Y<32 && Y>1 )
+ && X<121 && X>93
+ && Y<31 && Y>1 )
return true ;
else if( PadNbr == 10
- && X<128 && X>96
- && Y<64 && Y>32 )
+ && X<121 && X>93
+ && Y<60 && Y>26 )
return true ;
else if( PadNbr == 11
- && X<96 && X>64
- && Y<32 && Y>1 )
+ && X<96 && X>61
+ && Y<31 && Y>1 )
return true ;
else if( PadNbr == 12
- && X<96 && X>64
- && Y<64 && Y>32)
+ && X<96 && X>61
+ && Y<60 && Y>26)
return true ;
else if( PadNbr == 13
- && X<64 && X>32
- && Y<64 && Y>32 )
+ && X<67 && X>30
+ && Y<60 && Y>26 )
return true ;
else if( PadNbr == 14
- && X<64 && X>32
- && Y<32 && Y>1 )
+ && X<67 && X>30
+ && Y<31 && Y>1 )
return true ;
else if( PadNbr == 15
- && X<32 && X>1
- && Y<64 && Y>32 )
+ && X<35 && X>6
+ && Y<60 && Y>26 )
return true ;
else if( PadNbr == 16
- && X<32 && X>1
- && Y<32 && Y>1 )
+ && X<35 && X>6
+ && Y<31 && Y>1 )
return true ;
diff --git a/NPSimulation/src/MUST2Array.cc b/NPSimulation/src/MUST2Array.cc
index c740319c95b60a4b1044c4be95d26cce1a940ba1..8b18d4b053b8d28e568af766f7d27e05afb65bbd 100644
--- a/NPSimulation/src/MUST2Array.cc
+++ b/NPSimulation/src/MUST2Array.cc
@@ -223,7 +223,7 @@ void MUST2Array::VolumeMaker(G4int TelescopeNumber ,
if (wSiLi) {
G4double SiLiSpace = 8 * mm;
- G4RotationMatrix* rotSiLi = Rotation(0., 0., 0.);
+ G4RotationMatrix* rotSiLi = new G4RotationMatrix(0,0,-90*deg); //Rotation(0., 0., 0.);
// G4Box* solidSiLi = new G4Box("SiLi", 0.5*SiLiFaceX, 0.5*SiLiFaceY, 0.5*SiLiThickness);
@@ -373,27 +373,27 @@ void MUST2Array::VolumeMaker(G4int TelescopeNumber ,
// up
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LT_up , logicSiLi_LT , Name + "_SiLi_Pad9" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RT_up , logicSiLi_RT , Name + "_SiLi_Pad16" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC1_up , logicSiLi_LC1 , Name + "_SiLi_Pad11" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC1_up , logicSiLi_RC1 , Name + "_SiLi_Pad14" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LT_up , logicSiLi_LT , Name + "_SiLi_Pad16" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RT_up , logicSiLi_RT , Name + "_SiLi_Pad15" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC1_up , logicSiLi_LC1 , Name + "_SiLi_Pad14" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC1_up , logicSiLi_RC1 , Name + "_SiLi_Pad13" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LB_up , logicSiLi_LB , Name + "_SiLi_Pad10" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RB_up , logicSiLi_RB , Name + "_SiLi_Pad15" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC2_up , logicSiLi_LC2 , Name + "_SiLi_Pad12" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC2_up , logicSiLi_RC2 , Name + "_SiLi_Pad13" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LB_up , logicSiLi_LB , Name + "_SiLi_Pad9" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RB_up , logicSiLi_RB , Name + "_SiLi_Pad10" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC2_up , logicSiLi_LC2 , Name + "_SiLi_Pad11" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC2_up , logicSiLi_RC2 , Name + "_SiLi_Pad12" , logicSiLi , false , 0) ;
// down
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LT_down , logicSiLi_LT , Name + "_SiLi_Pad2" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RT_down , logicSiLi_RT , Name + "_SiLi_Pad7" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC1_down , logicSiLi_LC1 , Name + "_SiLi_Pad4" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC1_down , logicSiLi_RC1 , Name + "_SiLi_Pad5" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LT_down , logicSiLi_LT , Name + "_SiLi_Pad7" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RT_down , logicSiLi_RT , Name + "_SiLi_Pad8" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC1_down , logicSiLi_LC1 , Name + "_SiLi_Pad5" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC1_down , logicSiLi_RC1 , Name + "_SiLi_Pad6" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LB_down , logicSiLi_LB , Name + "_SiLi_Pad1" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RB_down , logicSiLi_RB , Name + "_SiLi_Pad8" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC2_down , logicSiLi_LC2 , Name + "_SiLi_Pad3" , logicSiLi , false , 0) ;
- PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC2_down , logicSiLi_RC2 , Name + "_SiLi_Pad6" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LB_down , logicSiLi_LB , Name + "_SiLi_Pad2" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RB_down , logicSiLi_RB , Name + "_SiLi_Pad1" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_LC2_down , logicSiLi_LC2 , Name + "_SiLi_Pad4" , logicSiLi , false , 0) ;
+ PVPBuffer = new G4PVPlacement(0 , positionSiLi_RC2_down , logicSiLi_RC2 , Name + "_SiLi_Pad3" , logicSiLi , false , 0) ;
@@ -411,15 +411,18 @@ void MUST2Array::VolumeMaker(G4int TelescopeNumber ,
logicSiLi_RC2->SetSensitiveDetector(m_SiLiScorer);
// Mark blue a SiLi to see telescope orientation
- logicSiLi_LT->SetVisAttributes(G4VisAttributes(G4Colour(0, 0., 1.)));
+ logicSiLi_LT->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
logicSiLi_RT->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
logicSiLi_LC1->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
logicSiLi_RC1->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
- logicSiLi_LB->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
+ logicSiLi_LB->SetVisAttributes(G4VisAttributes(G4Colour(0, 0, 1.)));
logicSiLi_RB->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
logicSiLi_LC2->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
logicSiLi_RC2->SetVisAttributes(G4VisAttributes(G4Colour(0, 1., 0)));
+
+
+ delete rotSiLi;
}
////////////////////////////////////////////////////////////////