diff --git a/Armory/ClassPW.h b/Armory/ClassPW.h index d1f5ef4..c257be3 100644 --- a/Armory/ClassPW.h +++ b/Armory/ClassPW.h @@ -123,20 +123,20 @@ inline void PW::ConstructGeo(){ for(int i = 0; i < nWire; i++ ){ // Anode rotate right-hand - p1.first.SetXYZ( radiusA * TMath::Cos( TMath::TwoPi() / nWire * (-i) + TMath::PiOver2()), - radiusA * TMath::Sin( TMath::TwoPi() / nWire * (-i) + TMath::PiOver2()), + p1.first.SetXYZ( radiusA * TMath::Cos( TMath::TwoPi() / nWire * (i) + TMath::PiOver2()), + radiusA * TMath::Sin( TMath::TwoPi() / nWire * (i) + TMath::PiOver2()), zLen/2); - p1.second.SetXYZ( radiusA * TMath::Cos( TMath::TwoPi() / nWire * (-i + wireShift) + TMath::PiOver2()), - radiusA * TMath::Sin( TMath::TwoPi() / nWire * (-i + wireShift) + TMath::PiOver2()), + p1.second.SetXYZ( radiusA * TMath::Cos( TMath::TwoPi() / nWire * (i + wireShift) + TMath::PiOver2()), + radiusA * TMath::Sin( TMath::TwoPi() / nWire * (i + wireShift) + TMath::PiOver2()), -zLen/2); An.push_back(p1); // Cathod rotate left-hand - q1.first.SetXYZ( radiusC * TMath::Cos( TMath::TwoPi() / nWire * (-i) + TMath::PiOver2()), - radiusC * TMath::Sin( TMath::TwoPi() / nWire * (-i) + TMath::PiOver2()), + q1.first.SetXYZ( radiusC * TMath::Cos( TMath::TwoPi() / nWire * (i) + TMath::PiOver2()), + radiusC * TMath::Sin( TMath::TwoPi() / nWire * (i) + TMath::PiOver2()), zLen/2); - q1.second.SetXYZ( radiusC * TMath::Cos( TMath::TwoPi() / nWire * (- i - wireShift) + TMath::PiOver2()), - radiusC * TMath::Sin( TMath::TwoPi() / nWire * (- i - wireShift) + TMath::PiOver2()), + q1.second.SetXYZ( radiusC * TMath::Cos( TMath::TwoPi() / nWire * (i - wireShift) + TMath::PiOver2()), + radiusC * TMath::Sin( TMath::TwoPi() / nWire * (i - wireShift) + TMath::PiOver2()), -zLen/2); Ca.push_back(q1); } diff --git a/Armory/ClassSX3.h b/Armory/ClassSX3.h index 99d2dbe..7354d19 100644 --- a/Armory/ClassSX3.h +++ b/Armory/ClassSX3.h @@ -121,7 +121,7 @@ inline void SX3::ConstructGeo(){ sa.SetXYZ( radius, -width/2, gap/2 + length/2 ); sb.SetXYZ( radius, width/2, gap/2 + length/2 ); - double rot = TMath::TwoPi() / numDet * (-i - 0.5) - TMath::PiOver2(); + double rot = TMath::TwoPi() / numDet * (i - 0.5) - TMath::PiOver2(); sa.RotateZ( rot ); sb.RotateZ( rot ); diff --git a/Armory/ClassTransfer.h b/Armory/ClassTransfer.h index 3c63413..c12c43f 100644 --- a/Armory/ClassTransfer.h +++ b/Armory/ClassTransfer.h @@ -243,11 +243,11 @@ TransferReaction::TransferReaction(){ thetaIN = 0.; phiIN = 0.; - SetA(12, 6, 0); - Seta(2,1); + SetA(24, 12, 0); + Seta(4,2); Setb(1,1); - SetB(13,6); - TA = 6; + SetB(27,13); + TA = 2.5; T = TA * reaction.beamA; ExA = 0; diff --git a/Armory/anasenMS.cpp b/Armory/anasenMS.cpp index a8b8c04..1fc6e64 100644 --- a/Armory/anasenMS.cpp +++ b/Armory/anasenMS.cpp @@ -26,18 +26,18 @@ int main(int argc, char **argv){ //Reaction TransferReaction transfer; - transfer.SetA(12, 6, 0); + transfer.SetA(24,12, 0); transfer.SetIncidentEnergyAngle(10, 0, 0); - transfer.Seta( 2, 1); + transfer.Seta( 4, 2); transfer.Setb( 1, 1); std::vector ExAList = {0}; std::vector ExList = {0, 1, 2}; - double vertexXRange[2] = { -5, 5}; // mm - double vertexYRange[2] = { -5, 5}; - double vertexZRange[2] = {-70, 70}; + double vertexXRange[2] = { -5,5}; // mm + double vertexYRange[2] = { -5,5}; + double vertexZRange[2] = {-100,100}; double sigmaSX3_W = -1; // mm, < 0 use mid-point double sigmaSX3_L = 5; // mm, < 0 use mid-point @@ -55,7 +55,7 @@ int main(int argc, char **argv){ printf(" SX3 vertical : %.1f\n", sigmaSX3_L); printf(" Anode : %.1f mm\n", sigmaPW_A); printf(" Cathode : %.1f mm\n", sigmaPW_C); - + printf(" num_eve : %.1d ",numEvent); transfer.CalReactionConstant(); int nExA = ExAList.size(); @@ -65,7 +65,7 @@ int main(int argc, char **argv){ SX3 * sx3 = anasen->GetSX3(); PW * pw = anasen->GetPW(); - TString saveFileName = "SimAnasen.root"; + TString saveFileName = "SimAnasen1.root"; printf("\e[32m#################################### building Tree in %s\e[0m\n", saveFileName.Data()); TFile * saveFile = new TFile(saveFileName, "recreate"); TTree * tree = new TTree("tree", "tree"); @@ -269,4 +269,4 @@ int main(int argc, char **argv){ return 0; -} \ No newline at end of file +} diff --git a/mapping.h b/mapping.h index bd1ac61..45e5ee5 100644 --- a/mapping.h +++ b/mapping.h @@ -19,7 +19,7 @@ const std::map board = { {4, 22129}, {5, 15529}, {6, 15528}, - {7, 379}, + {7, 334}, {8, 409}, {9, 405} };