From e4abc9ce320b3719b254be61cb3b3182d479d8c1 Mon Sep 17 00:00:00 2001
From: Anna Maria CORSI SPhN <acorsi@irfulx168.(none)>
Date: Tue, 11 Mar 2014 18:14:53 +0100
Subject: [PATCH] SiLi SiRes LaBr3 added to the DetectorManager
---
NPAnalysis/e628/Analysis | Bin 40160 -> 0 bytes
NPAnalysis/e628/Analysis.cxx | 123 ---------------------------
NPAnalysis/e628/Analysis.h | 124 ----------------------------
NPAnalysis/e628/Analysis.o | Bin 34360 -> 0 bytes
NPLib/VDetector/DetectorManager.cxx | 62 +++++++++++++-
5 files changed, 61 insertions(+), 248 deletions(-)
delete mode 100755 NPAnalysis/e628/Analysis
delete mode 100644 NPAnalysis/e628/Analysis.cxx
delete mode 100644 NPAnalysis/e628/Analysis.h
delete mode 100644 NPAnalysis/e628/Analysis.o
diff --git a/NPAnalysis/e628/Analysis b/NPAnalysis/e628/Analysis
deleted file mode 100755
index 3138112caa7c4f7fda0464ade61011ab76749be6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 40160
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
Q_)!@@Y{>XPSZ!GTKg<8HssI20
diff --git a/NPAnalysis/e628/Analysis.cxx b/NPAnalysis/e628/Analysis.cxx
deleted file mode 100644
index 2aa4edd55..000000000
--- a/NPAnalysis/e628/Analysis.cxx
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "Analysis.h"
-#include<bitset>
-using namespace std;
-#include "TTriggerData.h"
-
-int main(int argc, char** argv){
- // command line parsing
- NPOptionManager* myOptionManager = NPOptionManager::getInstance(argc,argv);
-
- // Instantiate RootInput
- string runToReadfileName = myOptionManager->GetRunToReadFile();
- RootInput:: getInstance(runToReadfileName);
-
- // if input files are not given, use those from TAsciiFile
- if (myOptionManager->IsDefault("DetectorConfiguration")) {
- string name = RootInput::getInstance()->DumpAsciiFile("DetectorConfiguration");
- myOptionManager->SetDetectorFile(name);
- }
-
- // get input files from NPOptionManager
- string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
- string OutputfileName = myOptionManager->GetOutputFile();
-
- // Instantiate RootOutput
- RootOutput::getInstance("Analysis/"+OutputfileName, "AnalysedTree");
-
- // Instantiate the detector using a file
- NPA::DetectorManager* myDetector = new DetectorManager();
- myDetector->ReadConfigurationFile(detectorfileName);
- double EGammaDC[4];
- RootOutput::getInstance()->GetTree()->Branch("EGammaDC", &EGammaDC,"EGammaDC[4]/D");
- double GATCONF[16];
- RootOutput::getInstance()->GetTree()->Branch("GATCONF",&GATCONF,"GATCONF[16]/I");
- float beta=0.18441; //This beta is used in "EGammaDC" ----- the beta used in "DopplerCorrectedEnergy" is definded in ./config/beta.txt !!!!!!!!!
-
- // Get the formed Chained Tree and Treat it
- TChain* Chain = RootInput:: getInstance() -> GetChain();
- TExogamPhysics *Exo = (TExogamPhysics*) myDetector -> GetDetector("EXOGAM") ;
-
- // Branching Gatconf
- TTriggerData* trigger = new TTriggerData();
- Chain->SetBranchStatus("TRIG", true);
- Chain->SetBranchStatus("fTRIG_1", true);
- Chain->SetBranchStatus("fTRIG_2", false);
- Chain->SetBranchStatus("fTRIG_3", false);
- Chain->SetBranchStatus("fTRIG_4", false);
- Chain->SetBranchStatus("fTRIG_5", false);
- Chain->SetBranchAddress("TRIG", &trigger);
- // Get number of events to treat
- cout << endl << "///////// Starting Analysis ///////// "<< endl;
- int nentries = Chain->GetEntries();
- cout << " Number of Event to be treated : " << nentries << endl;
- clock_t begin = clock();
- clock_t end = begin;
-
- // main loop on entries
- for (int i = 0; i < nentries; i++) {
- if (i%10000 == 0 && i!=0) {
- cout.precision(5);
- end = clock();
- double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
- double percent = (double)i/nentries;
- double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
- cout << " "<< flush;
- cout << "\r Progression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait <<"s"<< flush;
- }
- else if (i == nentries-1) cout << "\r Progression:" << " 100% " <<endl;
-
- // get data
- Chain -> GetEntry(i);
- int gatconf_integer = trigger->GetTRIG1();
- // Create a bitset of 16 bit,
- // each bit is set to one if the corresponding GMT entry has been fired
- bitset<16> gatconf(gatconf_integer);
-
- // Fill the GATCONF array:
- for(unsigned int i = 0 ; i < 16 ; i++)
- GATCONF[i]=gatconf[i];
-
-
-
- // example of usage:
- // Let say I want to perform an action if TiaraBarrel has been fired
- // and that Tiara Barrel is wired to entry 8 of GATCONF
- // Then I just have to take the entry 8th element (index 7) of the Gatconf
- // array
- if(GATCONF[7])
- cout<<"Entry 8 of GMT has been fired" << endl;
-
- myDetector->ClearEventPhysics();
- myDetector->BuildPhysicalEvent();
-
- /************************************************/
-
- for(int i=0; i<4; i++)
- EGammaDC[i]=0;
-
- for(int i=0; i<Exo->TotalEnergy_lab.size(); i++){
- float mytheta=Exo->GetSegmentAngleTheta(Exo->CloverNumber[i], Exo->CristalNumber[i], Exo->SegmentNumber[i]);
- float myphi=Exo->GetSegmentAnglePhi(Exo->CloverNumber[i], Exo->CristalNumber[i], Exo->SegmentNumber[i]);
- //myv(Exo->TotalEnergy_lab[i]*sin(mytheta)*sin(myphi),Exo->TotalEnergy_lab[i]*sin(mytheta)*cos(myphi) , Exo->TotalEnergy_lab[i]*cos(mytheta),(Exo->TotalEnergy_lab)[i]);
- //cout<<Exo->TotalEnergy_lab[i]<<endl;
- EGammaDC[i]=Exo->TotalEnergy_lab[i]*(1-beta*cos(mytheta*TMath::DegToRad()))/sqrt(1-beta*beta);
- //TVector3 boost= imp4.BoostVector();
- //myv.Boost(-boost);
- //DopplerCorrectedEnergy.push_back(myv.T());
- //h_DopplerCorrectedEnergy->Fill(myv.T());
- }
-
- /************************************************/
-
- RootOutput::getInstance()->GetTree()->Fill();
- }
-
- cout << "A total of " << nentries << " event has been annalysed " << endl ;
-
- RootOutput::getInstance()->Destroy();
- RootInput::getInstance()->Destroy();
- NPOptionManager::getInstance()->Destroy();
-
- return 0 ;
-}
diff --git a/NPAnalysis/e628/Analysis.h b/NPAnalysis/e628/Analysis.h
deleted file mode 100644
index d5ca8c305..000000000
--- a/NPAnalysis/e628/Analysis.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// You can use this file to declare your spectra, file, energy loss , ... and whatever you want.
-// This way you can remove all unnecessary declaration in the main programm.
-// In order to help debugging and organizing we use Name Space.
-
-/////////////////////////////////////////////////////////////////////////////////////////////////
-// -------------------------------------- VARIOUS INCLUDE ---------------------------------------
-
-// NPA
-#include "DetectorManager.h"
-#include "NPOptionManager.h"
-
-// STL C++
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <cmath>
-#include <cstdlib>
-
-// ROOT
-#include <TROOT.h>
-#include <TChain.h>
-#include <TFile.h>
-#include <TLeaf.h>
-#include <TVector3.h>
-#include <TRandom.h>
-
-// NPL
-#include "RootInput.h"
-#include "RootOutput.h"
-#include "NPReaction.h"
-#include "TInitialConditions.h"
-#include "TPlasticData.h"
-#include "TMust2Data.h"
-#include "TMust2Physics.h"
-#include "TExogamPhysics.h"
-#include "TSSSDPhysics.h"
-#include "TPlasticPhysics.h"
-#include "GaspardTracker.h"
-
-// Use CLHEP System of unit and Physical Constant
-#include "NPGlobalSystemOfUnits.h"
-#include "NPPhysicalConstants.h"
-
-
-// ----------------------------------------------------------------------------------------------
-double ThetaCalculation (TVector3 A , TVector3 B) ;
-/////////////////////////////////////////////////////////////////////////////////////////////////
-// ----------------------------------- DOUBLE, INT, BOOL AND MORE -------------------------------
-namespace VARIABLE
- {
- // Declare your Variable here:
-
- double X1,Y1,Z1 ;
- int N1,N2 = 0 ;
- bool check= false ;
-
- // A Usefull Simple Random Generator
- TRandom Rand;
- }
-
-using namespace VARIABLE ;
-// ----------------------------------------------------------------------------------------------
-
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////
-// -----------------------------------GRAPH------------------------------------------------------
-#include <TObject.h>
-#include <TH1.h>
-#include <TH1F.h>
-#include <TH2.h>
-#include <TH2F.h>
-#include <TGraph2D.h>
-
-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 ;
-// --------------------------------------------------------------------------------------------
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// -----------------------------------CUT------------------------------------------------------
-#include <TCutG.h>
-namespace CUT
- {
- // Declare your Cut here:
-
- }
-
-using namespace CUT ;
-// --------------------------------------------------------------------------------------------
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-// -----------------------------------ENERGY LOSS----------------------------------------------
-#include "NPEnergyLoss.h"
-using namespace NPL ;
-namespace ENERGYLOSS
- {
-
- // Declare your Energy loss here :
- /* EnergyLoss ProtonTarget = EnergyLoss ( "CD2.txt" ,
- 100 ,
- 1,
- 1 );
- */
- }
-
-using namespace ENERGYLOSS ;
-// ----------------------------------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/NPAnalysis/e628/Analysis.o b/NPAnalysis/e628/Analysis.o
deleted file mode 100644
index 99a3bb88acdbc22e86397c660b0628c0b2d5b827..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 34360
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⁡Os|W
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
VK0adU;%NgUefdIWIgFu<{|kCnLSg^_
diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx
index 1b8870786..0b28af5d0 100644
--- a/NPLib/VDetector/DetectorManager.cxx
+++ b/NPLib/VDetector/DetectorManager.cxx
@@ -50,6 +50,9 @@
#include "TSpegPhysics.h"
#include "TExlPhysics.h"
#include "TTacPhysics.h"
+#include "TSiLiPhysics.h"
+#include "TSiResPhysics.h"
+#include "TLaBr3Physics.h"
#include "TChio_digPhysics.h"
#include "TChio_anPhysics.h"
#include "NPOptionManager.h"
@@ -84,9 +87,12 @@ void DetectorManager::ReadConfigurationFile(string Path) {
Bool_t ChateauCristal = false;
Bool_t Exogam = false;
Bool_t ScintillatorPlastic = false;
+ Bool_t SiLi = false;
+ Bool_t SiRes = false;
+ Bool_t LaBr3 = false;
Bool_t IonisationChamber = false;
Bool_t Trifoil = false;
- Bool_t Charissa = false;
+ Bool_t Charissa = false;
Bool_t GeneralTarget = false;
Bool_t GPDTracker = false;
Bool_t HYD2Tracker = false;
@@ -401,7 +407,61 @@ void DetectorManager::ReadConfigurationFile(string Path) {
AddDetector("Plastic", myDetector);
#endif
}
+ ////////////////////////////////////////////
+ ///////////// Search for LaBr3 ///////////
+ ////////////////////////////////////////////
+ else if (LineBuffer.compare(0, 5, "LaBr3") == 0 && LaBr3 == false) {
+#ifdef INC_PLASTIC
+ LaBr3 = true;
+ cout << "//////// Plastic ////////" << endl << endl;
+
+ // Instantiate the new array as a VDetector Object
+ VDetector* myDetector = new TLaBr3Physics();
+ // Read Position of Telescope
+ ConfigFile.close();
+ myDetector->ReadConfiguration(Path);
+ ConfigFile.open(Path.c_str());
+ // Add array to the VDetector Vector
+ AddDetector("LaBr3", myDetector);
+#endif
+ } ////////////////////////////////////////////
+ ///////////// Search for SiLi ///////////
+ ////////////////////////////////////////////
+ else if (LineBuffer.compare(0, 4, "SiLi") == 0 && SiLi == false) {
+#ifdef INC_PLASTIC
+ SiLi = true;
+ cout << "//////// Plastic ////////" << endl << endl;
+
+ // Instantiate the new array as a VDetector Object
+ VDetector* myDetector = new TSiLiPhysics();
+ // Read Position of Telescope
+ ConfigFile.close();
+ myDetector->ReadConfiguration(Path);
+ ConfigFile.open(Path.c_str());
+
+ // Add array to the VDetector Vector
+ AddDetector("SiLi", myDetector);
+#endif
+ } ////////////////////////////////////////////
+ ///////////// Search for SiRes ///////////
+ ////////////////////////////////////////////
+ else if (LineBuffer.compare(0, 5, "SiRes") == 0 && SiRes == false) {
+#ifdef INC_PLASTIC
+ SiRes = true;
+ cout << "//////// Plastic ////////" << endl << endl;
+
+ // Instantiate the new array as a VDetector Object
+ VDetector* myDetector = new TSiResPhysics();
+ // Read Position of Telescope
+ ConfigFile.close();
+ myDetector->ReadConfiguration(Path);
+ ConfigFile.open(Path.c_str());
+
+ // Add array to the VDetector Vector
+ AddDetector("SiRes", myDetector);
+#endif
+ }
///////////////////////////////////////////////////////
///////////// Search for Ionisation Chamber ///////////
///////////////////////////////////////////////////////
--
GitLab