Changeset 260 in Idarraga

Timestamp:

Nov 18, 2011, 3:28:19 PM (13 years ago)

Author:

idarraga

Message:

 

Location:

allpix

Files:

• allpix.cc (modified) (2 diffs)
• include/AllPixRun.hh (modified) (1 diff)
• include/AllPixRunAction.hh (modified) (3 diffs)
• include/AllPix_Hits_WriteToEntuple.h (modified) (1 diff)
• macros/oneDetector_Inventor_vis.in (modified) (1 diff)
• macros/telescope1_Inventor_vis.in (modified) (1 diff)
• src/AllPixRun.cc (modified) (1 diff)
• src/AllPixRunAction.cc (modified) (4 diffs)
• src/AllPix_Frames_WriteToEntuple.cc (modified) (1 diff)
• src/AllPix_Hits_WriteToEntuple.cc (modified) (4 diffs)

allpix/allpix.cc

@@ -140 +140 @@
         TString dataset = "AllPix";
         TString tempdir = "";
-        TString outputFilePrefix = detector->GetOutputFilePrefix();
-        AllPixRunAction * run_action = new AllPixRunAction(outputFilePrefix, dataset, tempdir,
+        AllPixRunAction * run_action = new AllPixRunAction(detector, dataset, tempdir,
                         "lciobridge_allpix.txt",
                         "lciobridge_allpix_dut.txt"); // dataset
@@ -249 +248 @@
         G4int nHC = event_action->GetNumberOfHC();
         for(G4int i = 0 ; i < nHC ; i++)
-                Hits_WriteToNtuple::GetInstance("", "", nHC, i)->closeNtuple();
+                Hits_WriteToNtuple::GetInstance("", "", "", nHC, i)->closeNtuple();
 
         G4cout << "[DONE]" << G4endl;

allpix/include/AllPixRun.hh

@@ -9 +9 @@
 #include "AllPixTrackerHit.hh"
 #include "AllPixRunAction.hh"
-#include "AllPixMedipix2Digit.hh"
+#include "AllPixMimosa26Digit.hh"
 #include "AllPixDigitInterface.hh"
 

allpix/include/AllPixRunAction.hh

@@ -55 +55 @@
 class G4Run;
 class AllPixRun;
+class AllPixDetectorConstruction;
 //class FramesHandler;
 //class WriteToNtuple;
@@ -71 +72 @@
 
 public:
-  AllPixRunAction(TString, TString, TString, TString, TString);
+  AllPixRunAction(AllPixDetectorConstruction *, TString, TString, TString, TString);
   ~AllPixRunAction();
   
@@ -80 +81 @@
   
 private:
-  TString m_outputFilePrefix;
+
+  AllPixDetectorConstruction * m_detectorPtr;
   TString m_dataset;
   TString m_tempdir;

allpix/include/AllPix_Hits_WriteToEntuple.h

@@ -72 +72 @@
 public:
 
-  Hits_WriteToNtuple(TString, TString, Int_t, TString om="RECREATE");
+  Hits_WriteToNtuple(TString, TString, TString, Int_t, TString om="RECREATE");
   ~Hits_WriteToNtuple(){};
   void fillVars(SimpleHits *);
   void closeNtuple();
   TString GetNtupleFileName(){return m_ntupleFileName;};
-  static Hits_WriteToNtuple * GetInstance(TString, TString, Int_t, Int_t, TString openmode = "RECREATE");
+  static Hits_WriteToNtuple * GetInstance(TString, TString, TString, Int_t, Int_t, TString openmode = "RECREATE");
   TTree * GetTree(){return t2;};
   //void SetBranchAddress(FrameStruct * fs){b2->SetAddress(fs);};

allpix/macros/oneDetector_Inventor_vis.in

@@ -25 +25 @@
 # Build detectors
 /allpix/det/update
+
+####################################################################
+# prefix for output filename (string) Don't use quotation marks \"
+/allpix/config/setOutputPrefixWithPath dataprefix
 
 ########################################################################

allpix/macros/telescope1_Inventor_vis.in

@@ -127 +127 @@
 /allpix/det/setRotation  0.0 0.0 180.0 deg
 /allpix/det/setLowTHL    13. keV
+
+####################################################################
+# prefix for output filename (string) Don't use quotation marks \"
+/allpix/config/setOutputPrefixWithPath dataprefix
 
 ####################################################################

allpix/src/AllPixRun.cc

@@ -309 +309 @@
                 // fillVars rewinds values
                 m_datasetHits = SDman->GetHCtable()->GetHCname(itrCol);
-                Hits_WriteToNtuple::GetInstance(m_datasetHits,
+                Hits_WriteToNtuple::GetInstance(m_outputFilePrefix, m_datasetHits,
                                 m_tempdir,
                                 nHC, // here is the number of Hit Collections (SD), not detectors.

allpix/src/AllPixRunAction.cc

@@ -41 +41 @@
 #include "AllPixRun.hh"
 
+#include "AllPixDetectorConstruction.hh"
 #include "AllPix_Frames_WriteToEntuple.h"
 #include "allpix_dm.h"
@@ -51 +52 @@
 
 // this constructor is called only once in the whole program
-AllPixRunAction::AllPixRunAction(TString ofp, TString ds, TString td, TString lciofn, TString lciofn_dut)
+AllPixRunAction::AllPixRunAction(AllPixDetectorConstruction * det, TString ds, TString td, TString lciofn, TString lciofn_dut)
 {
 
-  m_outputFilePrefix = ofp;
+        m_detectorPtr = det;
         m_dataset = ds;
         m_tempdir = td;
@@ -82 +83 @@
 G4Run * AllPixRunAction::GenerateRun(){
 
-  m_AllPixRun = new AllPixRun(m_outputFilePrefix, m_dataset, m_tempdir); // keep this pointer
+        m_AllPixRun = new AllPixRun(m_detectorPtr->GetOutputFilePrefix(), m_dataset, m_tempdir); // keep this pointer
         m_AllPixRun->SetLCIOBridgeFileDsc(m_lciobridge_f, m_lciobridge_dut_f);
 
@@ -108 +109 @@
         timer->Stop();
         G4cout << "event Id = " << aRun->GetNumberOfEvent()
-                         << " " << *timer << G4endl;
+                                         << " " << *timer << G4endl;
 
 }

allpix/src/AllPix_Frames_WriteToEntuple.cc

@@ -26 +26 @@
                 m_ntupleFileName += "/";
         }
+
 
         if(prefix.Length() > 0){

allpix/src/AllPix_Hits_WriteToEntuple.cc

@@ -12 +12 @@
 int g_instance_hit_Cntr = 0;
 
-Hits_WriteToNtuple::Hits_WriteToNtuple(TString dataSet, TString tempScratchDir, 
-                                       Int_t /*detID*/, TString openmode /* default "RECREATE" */){
+Hits_WriteToNtuple::Hits_WriteToNtuple(TString prefix, TString dataSet, TString tempScratchDir,
+                Int_t /*detID*/, TString openmode /* default "RECREATE" */){
 
-  m_MPXDataSetNumber = dataSet;
-  m_ntupleFileName = "";
+        m_MPXDataSetNumber = dataSet;
+        m_ntupleFileName = "";
 
-  // change dir if requested
-  if(tempScratchDir.Length() > 0){
-    m_ntupleFileName += tempScratchDir;
-    m_ntupleFileName += "/";
-  }
+        // change dir if requested
+        if(tempScratchDir.Length() > 0){
+                m_ntupleFileName += tempScratchDir;
+                m_ntupleFileName += "/";
+        }
 
-  m_ntupleFileName += "Hits_"+m_MPXDataSetNumber;
-  m_ntupleFileName += ".root";
+        if(prefix.Length() > 0){
+                m_ntupleFileName += prefix;
+                m_ntupleFileName += "_";
+                m_ntupleFileName += m_MPXDataSetNumber;
+        } else {
+                m_ntupleFileName += "Hits_"+m_MPXDataSetNumber;
+        }
+        m_ntupleFileName += ".root";
 
-  nt = new TFile(m_ntupleFileName, openmode);
-  t2 = new TTree("AllPixHits", dataSet);
+        nt = new TFile(m_ntupleFileName, openmode);
+        t2 = new TTree("AllPixHits", dataSet);
 
-  m_storableHits = new SimpleHits;
-  m_storableHits->Rewind();
-  t2->Branch("SimpleHits", "SimpleHits", &m_storableHits);
+        m_storableHits = new SimpleHits;
+        m_storableHits->Rewind();
+        t2->Branch("SimpleHits", "SimpleHits", &m_storableHits);
 
 }
@@ -40 +46 @@
  *
  */
-Hits_WriteToNtuple * Hits_WriteToNtuple::GetInstance(TString dataset, TString tempdir, Int_t nOfInstances, Int_t detID, TString openmode /* RECREATE */){
+Hits_WriteToNtuple * Hits_WriteToNtuple::GetInstance(TString prefix, TString dataset, TString tempdir, Int_t nOfInstances, Int_t detID, TString openmode /* RECREATE */){
 
-  if(detID >= nOfInstances){
-    std::cout << "[ERROR] (in Hits_WriteToNtuple::GetInstance) you are asking for the " << detID << "th hits ntuple"
-              << " out of " << nOfInstances << " aborting ..." << std::endl;
-    std::cout << "        (note: Indexing starts at 0)" << std::endl;
-    exit(1);
-  }
-  
-  TString tempDataset = dataset;
-  if (instance_hit == 0){
-    // create pointers for all instances
-    instance_hit = new Hits_WriteToNtuple * [nOfInstances]; 
-  }
+        if(detID >= nOfInstances){
+                std::cout << "[ERROR] (in Hits_WriteToNtuple::GetInstance) you are asking for the " << detID << "th hits ntuple"
+                                << " out of " << nOfInstances << " aborting ..." << std::endl;
+                std::cout << "        (note: Indexing starts at 0)" << std::endl;
+                exit(1);
+        }
 
-  // but instanciate only once at a time
-  if(g_instance_hit_Cntr < nOfInstances)
-    {
-      std::cout << "Creating hits file : " 
-                << "\"" << tempDataset
-                << "\"" << std::endl;
-      instance_hit[detID] = new Hits_WriteToNtuple(tempDataset, tempdir, detID, openmode);
-      g_instance_hit_Cntr++;
-    }
+        TString tempDataset = dataset;
+        if (instance_hit == 0){
+                // create pointers for all instances
+                instance_hit = new Hits_WriteToNtuple * [nOfInstances];
+        }
 
-  return instance_hit[detID];
+        // but instanciate only once at a time
+        if(g_instance_hit_Cntr < nOfInstances)
+        {
+                std::cout << "Creating hits file : "
+                                << "\"" << tempDataset
+                                << "\"" << std::endl;
+                instance_hit[detID] = new Hits_WriteToNtuple(prefix, tempDataset, tempdir, detID, openmode);
+                g_instance_hit_Cntr++;
+        }
+
+        return instance_hit[detID];
 }
 
 void Hits_WriteToNtuple::fillVars(SimpleHits * hits_i){
 
-  // Variables(class) in the Tree
-  m_storableHits = hits_i;
+        // Variables(class) in the Tree
+        m_storableHits = hits_i;
 
-  // fill the Tree
-  nt->cd();
-  t2->Fill();
+        // fill the Tree
+        nt->cd();
+        t2->Fill();
 
-  // clean up
-  m_storableHits->Rewind();
+        // clean up
+        m_storableHits->Rewind();
 
 }
@@ -85 +91 @@
 {
 
-  nt->cd();
-  t2->Write();
-  nt->Close();
+        nt->cd();
+        t2->Write();
+        nt->Close();
 
 }
@@ -95 +101 @@
 
 SimpleHits::SimpleHits(){
-  Rewind();
+        Rewind();
 }
 
 void SimpleHits::Rewind(){
 
-  edepTotal = 0.;
+        edepTotal = 0.;
 
-  interactions.clear();
-  pos.clear();
-  pdgId.clear();
-  edep.clear();
-  trackId.clear();
-  parentId.clear();
-  trackVolumeName.clear();
-  parentVolumeName.clear();
-  
-  event = 0;
-  run = 0;
+        interactions.clear();
+        pos.clear();
+        pdgId.clear();
+        edep.clear();
+        trackId.clear();
+        parentId.clear();
+        trackVolumeName.clear();
+        parentVolumeName.clear();
+
+        event = 0;
+        run = 0;
 }