diff --git a/NPAnalysis/pMakePhysicalTree/DataProcessor.cxx b/NPAnalysis/pMakePhysicalTree/DataProcessor.cxx
index 75a044a123906f2500bf2fa55bb6fe04007d9e2b..dd2769ae600be11e9df019763b72afed5741d330 100644
--- a/NPAnalysis/pMakePhysicalTree/DataProcessor.cxx
+++ b/NPAnalysis/pMakePhysicalTree/DataProcessor.cxx
@@ -47,13 +47,10 @@ void DataProcessor::SlaveBegin(TTree*){
m_OutputTree = RootOutput::getInstance()->GetTree();
//Merging via file:
- // Just create the object
UInt_t opt = TProofOutputFile::kRegister | TProofOutputFile::kOverwrite | TProofOutputFile::kVerify;
-
m_ProofFile = new TProofOutputFile("Local.root",TProofOutputFile::kDataset, opt );
m_OutputFile = m_ProofFile->OpenFile("RECREATE");
-
m_OutputTree->SetDirectory(m_OutputFile);
m_OutputTree->AutoSave();
m_OutputFile->Flush();
@@ -70,24 +67,22 @@ Bool_t DataProcessor::Process(Long64_t entry){
//_____________________________________________________________________________
void DataProcessor::Terminate(){
- sleep(1000);
- cout << 1 << endl ;
- string OutputfileName = NPOptionManager::getInstance(GetOption())->GetOutputFile();cout << 2 << endl ;
- RootOutput::getInstance(OutputfileName, "S1107Physics");cout << 3 << endl ;
- TFile* OutputFile = RootOutput::getInstance()->InitFile( NPOptionManager::getInstance(GetOption())->GetOutputFile());cout << 4 << endl ;
+ string OutputfileName = NPOptionManager::getInstance(GetOption())->GetOutputFile();
+ RootOutput::getInstance(OutputfileName, "S1107Physics");
+ TFile* OutputFile = RootOutput::getInstance()->InitFile( NPOptionManager::getInstance(GetOption())->GetOutputFile());
GetOutputList()->Print();
- m_ProofFile = dynamic_cast<TProofOutputFile*>(GetOutputList()->FindObject("Local.root"));cout << 5 << endl ;
+ m_ProofFile = dynamic_cast<TProofOutputFile*>(GetOutputList()->FindObject("Local.root"));
- TString outputFile(m_ProofFile->GetOutputFileName());cout << 6 << endl ;
- m_OutputFile = TFile::Open(outputFile);cout << 7 << endl ;
- m_OutputTree = (TTree*) m_OutputFile->Get("S1107Physics");cout << 8 << endl ;
- m_OutputTree->SetDirectory(OutputFile);cout << 9 << endl ;
- m_OutputTree->Write();cout << 10 << endl ;
- OutputFile->Flush();cout << 11 << endl ;
- m_OutputFile->Close();cout << 12 << endl ;
- OutputFile->Close();cout << 13 << endl ;
- RootOutput::getInstance()->Destroy();cout << 14 << endl ;
+ TString outputFile(m_ProofFile->GetOutputFileName());
+ m_OutputFile = TFile::Open(outputFile);
+ m_OutputTree = (TTree*) m_OutputFile->Get("S1107Physics");
+ m_OutputTree->SetDirectory(OutputFile);
+ m_OutputTree->Write();
+ OutputFile->Flush();
+ m_OutputFile->Close();
+ OutputFile->Close();
+ RootOutput::getInstance()->Destroy();
/* TFile* OutputFile = RootOutput::getInstance()->InitFile( NPOptionManager::getInstance(GetOption())->GetOutputFile());
@@ -109,3 +104,10 @@ void DataProcessor::SlaveTerminate(){
RootInput::getInstance()->Destroy();
NPOptionManager::getInstance()->Destroy();
}
+
+//_____________________________________________________________________________
+void DataProcessor::Begin(TTree*){
+
+
+
+}
diff --git a/NPAnalysis/pMakePhysicalTree/DataProcessor.h b/NPAnalysis/pMakePhysicalTree/DataProcessor.h
index 3b8d8c0299b7b86dd9d27c337b800a609d35b2fc..dd422adbfe1782d29adc16ff65e61310edcba500 100644
--- a/NPAnalysis/pMakePhysicalTree/DataProcessor.h
+++ b/NPAnalysis/pMakePhysicalTree/DataProcessor.h
@@ -50,6 +50,7 @@ class DataProcessor : public TSelector {
virtual ~DataProcessor();
virtual Int_t Version() const { return 2; }
virtual void SlaveBegin(TTree *tree);
+ virtual void Begin(TTree*);
virtual Bool_t Process(Long64_t entry);
virtual void SetOption(const char *option) { fOption = option; }
virtual void SetObject(TObject *obj) { fObject = obj; }
diff --git a/NPAnalysis/pMakePhysicalTree/DataProcessor_cxx.d b/NPAnalysis/pMakePhysicalTree/DataProcessor_cxx.d
deleted file mode 100644
index 168d1bcaccaa21b6e66a9a5a7f563fdc876ca03e..0000000000000000000000000000000000000000
--- a/NPAnalysis/pMakePhysicalTree/DataProcessor_cxx.d
+++ /dev/null
@@ -1,121 +0,0 @@
-
-# DO NOT DELETE
-
-./DataProcessor_cxx.so: DataProcessor.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/DetectorManager.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/VDetector.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPOptionManager.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TSelector.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TObject.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/Rtypes.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/RConfig.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/RVersion.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/DllImport.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/Rtypeinfo.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/snprintf.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/strlcpy.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TGenericClassInfo.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TSchemaHelper.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TStorage.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVersionCheck.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/Riosfwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TBuffer.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TString.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMathBase.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TSelectorList.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TList.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TSeqCollection.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TCollection.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TIterator.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TROOT.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TDirectory.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TNamed.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TDatime.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TUUID.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TChain.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TTree.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TBranch.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TObjArray.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttFill.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TDataType.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TDictionary.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/Property.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttLine.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttMarker.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TArrayD.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TArray.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TArrayI.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TClass.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TObjString.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVirtualTreePlayer.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TFile.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TDirectoryFile.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMap.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/THashTable.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TUrl.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TLeaf.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVector3.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TError.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVector2.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrix.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixF.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixT.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixTBase.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixFBasefwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixDBasefwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVectorFfwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVectorDfwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixTUtils.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixFfwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixFUtils.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMatrixFUtilsfwd.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TRandom.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TSystem.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TInetAddress.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TTimer.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TSysEvtHandler.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TQObject.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TTime.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TProofOutputFile.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/RootInput.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/RootOutput.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TAsciiFile.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPReaction.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPNucleus.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TLorentzVector.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TMath.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TRotation.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPGlobalSystemOfUnits.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPPhysicalConstants.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPSystemOfUnits.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPBeam.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TH1F.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TH1.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAxis.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttAxis.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TArrayC.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TArrayS.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TArrayF.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/Foption.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TFitResultPtr.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TH2F.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TH2.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TLorentzRotation.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TGraph.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TCanvas.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TPad.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVirtualPad.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttPad.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TVirtualX.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttText.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/GuiTypes.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/Buttons.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TAttCanvas.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/TCanvasImp.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TInitialConditions.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TSharcData.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TSharcPhysics.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/CalibrationManager.h
-./DataProcessor_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/VDetector.h
-./DataProcessor_cxx.so: /usr/local/root-5.34.04/include/cintdictversion.h /usr/local/root-5.34.04/include/RVersion.h
-DataProcessor_cxx__ROOTBUILDVERSION= 5.34/04
diff --git a/NPAnalysis/pMakePhysicalTree/MakePhysicalTree.cxx b/NPAnalysis/pMakePhysicalTree/MakePhysicalTree.cxx
index 67cfa9f08c04b99549288b1a0cd610097254c781..37494941a00901e7489e7bb96694f0aa36efee57 100644
--- a/NPAnalysis/pMakePhysicalTree/MakePhysicalTree.cxx
+++ b/NPAnalysis/pMakePhysicalTree/MakePhysicalTree.cxx
@@ -3,7 +3,7 @@
#include "TProof.h"
#include "TDSet.h"
-void MakePhysicalTree(string option){
+void MakePhysicalTree(string option,int thread=-1){
TFile* f = new TFile("Local.root","RECREATE");
f->Close();
@@ -13,10 +13,14 @@ void MakePhysicalTree(string option){
TProof* plite;
if(!gProof)
- plite = TProof::Open("lite://") ;
+ if(thread < 0 )
+ plite = TProof::Open("lite://") ;
+ else
+ plite = TProof::Open("lite://",Form("workers=%i",thread)) ;
else
plite = gProof;
+ option+=" --proof of=Local.root;stf";
plite->Process(DSet, "DataProcessor.cxx+", option.c_str());
return ;
diff --git a/NPAnalysis/pMakePhysicalTree/MakePhysicalTree_cxx.d b/NPAnalysis/pMakePhysicalTree/MakePhysicalTree_cxx.d
deleted file mode 100644
index 8752ab9c4710f01a051eaae96e3ed11e2b72f7b8..0000000000000000000000000000000000000000
--- a/NPAnalysis/pMakePhysicalTree/MakePhysicalTree_cxx.d
+++ /dev/null
@@ -1,139 +0,0 @@
-
-# DO NOT DELETE
-
-./MakePhysicalTree_cxx.so: DataProcessor.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/DetectorManager.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/VDetector.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPOptionManager.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TSelector.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TObject.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Rtypes.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/RConfig.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/RVersion.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/DllImport.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Rtypeinfo.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/snprintf.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/strlcpy.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TGenericClassInfo.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TSchemaHelper.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TStorage.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVersionCheck.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Riosfwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TBuffer.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TString.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMathBase.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TSelectorList.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TList.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TSeqCollection.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TCollection.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TIterator.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TROOT.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TDirectory.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TNamed.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TDatime.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TUUID.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TChain.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TTree.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TBranch.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TObjArray.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttFill.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TDataType.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TDictionary.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Property.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttLine.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttMarker.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TArrayD.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TArray.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TArrayI.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TClass.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TObjString.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVirtualTreePlayer.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TFile.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TDirectoryFile.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMap.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/THashTable.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TUrl.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TLeaf.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVector3.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TError.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVector2.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrix.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixF.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixT.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixTBase.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixFBasefwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixDBasefwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVectorFfwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVectorDfwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixTUtils.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixFfwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixFUtils.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMatrixFUtilsfwd.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TRandom.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TSystem.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TInetAddress.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TTimer.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TSysEvtHandler.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TQObject.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TTime.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TProofOutputFile.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/RootInput.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/RootOutput.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TAsciiFile.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPReaction.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPNucleus.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TLorentzVector.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMath.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TRotation.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPGlobalSystemOfUnits.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPPhysicalConstants.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPSystemOfUnits.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/NPBeam.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TH1F.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TH1.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAxis.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttAxis.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TArrayC.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TArrayS.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TArrayF.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Foption.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TFitResultPtr.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TH2F.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TH2.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TLorentzRotation.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TGraph.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TCanvas.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TPad.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVirtualPad.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttPad.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVirtualX.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttText.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/GuiTypes.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Buttons.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TAttCanvas.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TCanvasImp.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TInitialConditions.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TSharcData.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/TSharcPhysics.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/CalibrationManager.h
-./MakePhysicalTree_cxx.so: /Users/adrienmatta/Desktop/NPTool.dev.prerelease/NPLib/include/VDetector.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TProof.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TProofMgr.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TProofDebug.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMacro.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/MessageTypes.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMD5.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TRegexp.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Match.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TThread.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMutex.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TVirtualMutex.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TMutexImp.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TCondition.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TConditionImp.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/Varargs.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TThreadSlots.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TProofOutputList.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/TDSet.h
-./MakePhysicalTree_cxx.so: /usr/local/root-5.34.04/include/cintdictversion.h /usr/local/root-5.34.04/include/RVersion.h
-MakePhysicalTree_cxx__ROOTBUILDVERSION= 5.34/04
diff --git a/NPAnalysis/pMakePhysicalTree/RunToTreat.txt b/NPAnalysis/pMakePhysicalTree/RunToTreat.txt
index 15cf2a85a8b743c2139df7cf5bbf519a592ac1b5..4d110fe07df6045069832b0236653227109e352f 100644
--- a/NPAnalysis/pMakePhysicalTree/RunToTreat.txt
+++ b/NPAnalysis/pMakePhysicalTree/RunToTreat.txt
@@ -1,4 +1,4 @@
TTreeName
S1107Data
RootFileName
- /Volumes/S1107/RootData/data225*.root
+ /Volumes/S1107/RootData/data2253*.root
diff --git a/NPSimulation/include/Sharc.hh b/NPSimulation/include/Sharc.hh
index eb33b75507ab96aa6b7a4a8024d4c1adf5603fba..5dbf7f4dc210933d8c0b1822be3cff7596d84f86 100644
--- a/NPSimulation/include/Sharc.hh
+++ b/NPSimulation/include/Sharc.hh
@@ -125,7 +125,6 @@ namespace SHARC
// QQQ Wafer
const G4double QQQ_Wafer_Outer_Radius = 42.63*mm;
const G4double QQQ_Wafer_Inner_Radius = 7.8*mm;
- const G4double QQQ_Wafer_Thickness = 100*um;
const G4double QQQ_Wafer_Starting_Phi = 8*deg;
const G4double QQQ_Wafer_Stopping_Phi = 162*deg;
const G4int QQQ_Wafer_NumberOf_RadialStrip = 16 ;
@@ -150,7 +149,7 @@ public:
// To add a box detector
void AddBoxDetector(G4double Z,G4double Thickness1,G4double Thickness2,G4double Thickness3,G4double Thickness4,G4double ThicknessPAD1,G4double ThicknessPAD2,G4double ThicknessPAD3,G4double ThicknessPAD4);
// To add a Quadrant detector
- void AddQQQDetector(G4ThreeVector Pos);
+ void AddQQQDetector(G4ThreeVector Pos, G4double Thickness);
// Effectively construct Volume
void ConstructBOXDetector(G4LogicalVolume* world);
diff --git a/NPSimulation/src/Sharc.cc b/NPSimulation/src/Sharc.cc
index b0c98770bcc79a2de10708bbf51a3af0f97556b1..3a6c6e9bd48cb856e8e18ee406eaa50262241785 100644
--- a/NPSimulation/src/Sharc.cc
+++ b/NPSimulation/src/Sharc.cc
@@ -103,9 +103,10 @@ void Sharc::AddBoxDetector(G4double Z,G4double Thickness1,G4double Thickness2,G4
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void Sharc::AddQQQDetector(G4ThreeVector Pos){
+void Sharc::AddQQQDetector(G4ThreeVector Pos,G4double Thickness){
m_Type.push_back(false);
m_Pos.push_back(Pos);
+ m_ThicknessQQQ.push_back(Thickness);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -118,12 +119,13 @@ void Sharc::ReadConfiguration(string Path){
string LineBuffer ;
string DataBuffer ;
- G4double R,Phi,Thickness1,Thickness2,Thickness3,Thickness4,ThicknessPAD1,ThicknessPAD2,ThicknessPAD3,ThicknessPAD4,Z;
- R=Phi=Thickness1=Thickness2=Thickness3=Thickness4=ThicknessPAD1=ThicknessPAD2=ThicknessPAD3=ThicknessPAD4=Z=0;
+ G4double R,Phi,Thickness,Thickness1,Thickness2,Thickness3,Thickness4,ThicknessPAD1,ThicknessPAD2,ThicknessPAD3,ThicknessPAD4,Z;
+ R=Phi=Thickness=Thickness1=Thickness2=Thickness3=Thickness4=ThicknessPAD1=ThicknessPAD2=ThicknessPAD3=ThicknessPAD4=Z=0;
G4ThreeVector Pos;
bool check_R = false ;
bool check_Phi = false ;
+ bool check_Thickness = false ;
bool check_Thickness1 = false ;
bool check_Thickness2 = false ;
bool check_Thickness3 = false ;
@@ -194,6 +196,13 @@ void Sharc::ReadConfiguration(string Path){
if(VerboseLevel==1) cout << " Phi= " << Phi/deg << "deg" << endl;
}
+ else if (DataBuffer == "ThicknessDector=") {
+ check_Thickness = true;
+ ConfigFile >> DataBuffer ;
+ Thickness= atof(DataBuffer.c_str())*um;
+ if(VerboseLevel==1) cout << " ThicknessDetector= " << Thickness/um << "mm" << endl;
+ }
+
///////////////////////////////////////////////////
// If no Detector Token and no comment, toggle out
else{
@@ -205,13 +214,14 @@ void Sharc::ReadConfiguration(string Path){
/////////////////////////////////////////////////
// If All necessary information there, toggle out
- if (check_R && check_Phi && check_Z){
+ if (check_R && check_Phi && check_Z && check_Thickness){
ReadingStatusQQQ = false;
- AddQQQDetector(G4ThreeVector(R,Phi,Z));
+ AddQQQDetector(G4ThreeVector(R,Phi,Z),Thickness);
// Reinitialisation of Check Boolean
check_R = false ;
check_Phi = false ;
+ check_Thickness = false ;
}
}
@@ -566,7 +576,7 @@ void Sharc::ConstructQQQDetector(G4LogicalVolume* world){
G4Tubs* Wafer = new G4Tubs("Wafer" ,
QQQ_Wafer_Inner_Radius,
QQQ_Wafer_Outer_Radius,
- QQQ_Wafer_Thickness*0.5,
+ m_ThicknessQQQ[i]*0.5,
QQQ_Wafer_Starting_Phi,
QQQ_Wafer_Stopping_Phi*0.5);