Changeset 250 in Idarraga

Timestamp:

Nov 11, 2011, 4:36:29 PM (13 years ago)

Author:

idarraga

Message:

 

Location:

allpix

Files:

• allpix.cc (modified) (2 diffs)
• src/AllPixDetectorConstruction.cc (modified) (2 diffs)
• src/AllPixDetectorMessenger.cc (modified) (4 diffs)
• src/AllPixRun.cc (modified) (3 diffs)
• src/AllPixRunAction.cc (modified) (2 diffs)
• src/AllPix_Frames_WriteToEntuple.cc (modified) (4 diffs)

allpix/allpix.cc

@@ -140 +140 @@
         TString dataset = "AllPix";
         TString tempdir = "";
-        AllPixRunAction * run_action = new AllPixRunAction(dataset, tempdir,
+        TString outputFilePrefix = detector->GetOutputFilePrefix();
+        AllPixRunAction * run_action = new AllPixRunAction(outputFilePrefix, dataset, tempdir,
                         "lciobridge_allpix.txt",
                         "lciobridge_allpix_dut.txt"); // dataset
@@ -242 +243 @@
         // G4int nDigitizers = event_action->GetNumberOfDigitizers();
         for( detItr = geoMap->begin() ; detItr != geoMap->end() ; detItr++) {
-                WriteToNtuple::GetInstance("", "", (int)geoMap->size(), (*detItr).first)->closeNtuple();
+          WriteToNtuple::GetInstance("", "", "", (int)geoMap->size(), (*detItr).first)->closeNtuple();
         }
 

allpix/src/AllPixDetectorConstruction.cc

@@ -711 +711 @@
 }
 
+/**
+ *  Someone get's informed throught the messenger about the prefix for the output file.
+ */
+void AllPixDetectorConstruction::SetOutputFilePrefix(G4String val){
+  m_outputFilePrefix = val;
+}
+
 #include "G4FieldManager.hh"
 #include "G4TransportationManager.hh"
@@ -756 +763 @@
 
 }
+

allpix/src/AllPixDetectorMessenger.cc

@@ -54 +54 @@
         m_detDir->SetGuidance("detector control");
 
+        m_configDir = new G4UIdirectory("/allpix/config/");
+        m_configDir->SetGuidance("allpix configuration");
+
         m_detDir = new G4UIdirectory("/allpix/extras/");
         m_detDir->SetGuidance("extras");
@@ -119 +122 @@
         m_ClockCmd->AvailableForStates(G4State_PreInit, G4State_Idle);
 
+        //////////////////////////
+        // Config
+
+        m_outputPrefix = new G4UIcmdWithAString("/allpix/config/setOutputPrefixWithPath", this);
+        m_outputPrefix->SetGuidance("Set output file prefix (path can be included).  If no path is specified, the file will be written to ./");
+        m_outputPrefix->SetParameterName("OutputPrefix", false);
+        m_outputPrefix->SetDefaultValue("allpixoutput");
+        m_outputPrefix->AvailableForStates(G4State_PreInit, G4State_Idle);
 
         //////////////////////////
@@ -195 +206 @@
         delete m_worldMaterial;
 
+        delete m_outputPrefix;
+
         delete m_detDir;
         delete m_allpixDir;
@@ -297 +310 @@
         }
 
+        if( command == m_outputPrefix ) 
+          {
+            G4cout << "Setting up output file prefix " << newValue << G4endl;
+            m_AllPixDetector->SetOutputFilePrefix( newValue );
+          }
 
 

allpix/src/AllPixRun.cc

@@ -29 +29 @@
  * This constructor is called once per run
  */
-AllPixRun::AllPixRun(TString dataset, TString tempDir){
+AllPixRun::AllPixRun(TString ofp, TString dataset, TString tempDir){
 
         // Call for an instance to write.  Need to know how
@@ -42 +42 @@
 
         // digit collection info
+        m_outputFilePrefix = ofp;
         m_datasetDigits = dataset;
         m_datasetDigits += "_det_";
@@ -183 +184 @@
                 //cout << " AllPixRun::FillFramesNtuple " << m_frames[i]->GetDetectorId() << endl;
 
-                WriteToNtuple::GetInstance(m_datasetDigits,
+                WriteToNtuple::GetInstance(m_outputFilePrefix, m_datasetDigits,
                                 m_tempdir,
                                 m_nOfDetectors,

allpix/src/AllPixRunAction.cc

@@ -51 +51 @@
 
 // this constructor is called only once in the whole program
-AllPixRunAction::AllPixRunAction(TString ds, TString td, TString lciofn, TString lciofn_dut)
+AllPixRunAction::AllPixRunAction(TString ofp, TString ds, TString td, TString lciofn, TString lciofn_dut)
 {
 
+  m_outputFilePrefix = ofp;
         m_dataset = ds;
         m_tempdir = td;
@@ -81 +82 @@
 G4Run * AllPixRunAction::GenerateRun(){
 
-        m_AllPixRun = new AllPixRun(m_dataset, m_tempdir); // keep this pointer
+  m_AllPixRun = new AllPixRun(m_outputFilePrefix, m_dataset, m_tempdir); // keep this pointer
         m_AllPixRun->SetLCIOBridgeFileDsc(m_lciobridge_f, m_lciobridge_dut_f);
 

allpix/src/AllPix_Frames_WriteToEntuple.cc

@@ -15 +15 @@
 static Int_t * indexToDetectorIdMap = 0;
 
-WriteToNtuple::WriteToNtuple(TString dataSet, TString tempScratchDir, Int_t detID, TString openmode /* default "RECREATE" */){
+WriteToNtuple::WriteToNtuple(TString prefix, TString dataSet, TString tempScratchDir, Int_t detID, TString openmode /* default "RECREATE" */){
 
         m_MPXDataSetNumber = dataSet;
@@ -27 +27 @@
         }
 
-        m_ntupleFileName += "MPXNtuple_"+m_MPXDataSetNumber;
+        if(prefix.Length() > 0){
+          m_ntupleFileName += prefix;
+          m_ntupleFileName += "_";
+          m_ntupleFileName += m_MPXDataSetNumber;
+        } else {
+          m_ntupleFileName += "MPXNtuple_"+m_MPXDataSetNumber;    
+        }
         m_ntupleFileName += ".root";
 
@@ -51 +57 @@
  *
  */
-WriteToNtuple * WriteToNtuple::GetInstance(TString dataset, TString tempdir, Int_t nOfDetectors, Int_t detID, TString openmode /* RECREATE */) {
+WriteToNtuple * WriteToNtuple::GetInstance(TString prefix, TString dataset, TString tempdir, Int_t nOfDetectors, Int_t detID, TString openmode /* RECREATE */) {
 
         TString tempDataset = dataset;
@@ -71 +77 @@
                         tempDataset += (*detItr).first; // append detector id
 
-                        instance[cntr] = new WriteToNtuple(tempDataset, tempdir, (*detItr).first, openmode);
+                        instance[cntr] = new WriteToNtuple(prefix, tempDataset, tempdir, (*detItr).first, openmode);
                         indexToDetectorIdMap[cntr] = (*detItr).first;