22.6.2012 - Kamil Sedlak

1) Small changes of the musrSimAna documentation
2) A new type of condition added to musrSimAna
3) A few more examples of macro files added
This commit is contained in:
2012-06-22 08:40:31 +00:00
parent 8a787cf4a0
commit d191e96ca0
14 changed files with 854 additions and 26 deletions

View File

@ -437,7 +437,7 @@ void musrRootOutput::BeginOfRunAction() {
htest5 = new TH1F("htest5","The debugging histogram 5",50,-4.,4.);
htest6 = new TH1F("htest6","The debugging histogram 6",50,0.,3.142);
htest7 = new TH1F("htest7","The debugging histogram 7",100000,0.,100.);
htest8 = new TH1F("htest8","The debugging histogram 8",50,0.,3.142);
htest8 = new TH1F("htest8","The debugging histogram 8",100000,0.,100.);
G4cout << "musrRootOutput::BeginOfRunAction() The Root tree and branches were defined."<<G4endl;
}
@ -455,9 +455,16 @@ void musrRootOutput::EndOfRunAction() {
htest5->Write();
htest6->Write();
htest7->Write();
// Needed for iterative musrSim runs (e.g. when searching for a quadrupole triplet focus using a python script)
// std::cout<<"DEBUG: FOCUS TEST: sigma="<<(htest7->GetMean())/(htest7->GetEntries())<<std::endl;
htest8->Write();
//-----------------------------------------------------------------------------------------
// Uncoment for iterative musrSim runs (e.g. when searching for a quadrupole triplet focus using a python script)
// // std::cout<<"DEBUG: FOCUS TEST: sigma="<<(htest7->GetMean())/(htest7->GetEntries())<<std::endl;
// // std::cout<<"DEBUG: FOCUS TEST: sigma="<<(htest7->GetMean())<<std::endl;
// Double_t xRMS_tmp = htest7->GetRMS();
// Double_t yRMS_tmp = htest8->GetRMS();
// std::cout<<"DEBUG: FOCUS TEST: sigma="<< sqrt(xRMS_tmp*xRMS_tmp + yRMS_tmp*yRMS_tmp) <<std::endl;
// htest8->Write();
//-----------------------------------------------------------------------------------------
//
// Variables exported from Geant simulation to the Root output
// static const Int_t nGeantParamD=10;
TVectorD TVector_GeantParametersD(maxNGeantParameters);

View File

@ -242,12 +242,13 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep) {
G4double polz_save=preStepPoint->GetPolarization().z();
myRootOutput->SetSaveDetectorInfo(tmpVolumeID,particle_id_save,ke_save,x_save,y_save,z_save,time_save,px_save,py_save,pz_save,polx_save,poly_save,polz_save);
//
// myRootOutput->htest7->Fill(sqrt(x_save*x_save+y_save*y_save));
//
// cks: Useful for iterative musrSim runs finding the beam focus (all driven by a python script)
// if (sqrt(x_save*x_save+y_save*y_save)<100.)
// musrErrorMessage::GetInstance()->musrError(INFO,"musrSteppingAction KAMILTEST: Beam focused",true);
//-----------------------------------------------------------------------------------------
// Uncoment for iterative musrSim runs (e.g. when searching for a quadrupole triplet focus using a python script)
// // myRootOutput->htest7->Fill(sqrt(x_save*x_save+y_save*y_save));
// // myRootOutput->htest7->Fill(x_save*x_save+y_save*y_save);
// myRootOutput->htest7->Fill(x_save);
// myRootOutput->htest8->Fill(y_save);
//-----------------------------------------------------------------------------------------
}
}
}