Changeset 368


Ignore:
Timestamp:
Jun 5, 2007, 9:45:57 AM (17 years ago)
Author:
campagne
Message:

Adapt to Nuance v2 Pdk event format, adapt to osc_g4 v16r0 (JEC)

Location:
MEMPHYS/HEAD
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • MEMPHYS/HEAD/MEMPHYS/PrimaryGeneratorAction.hh

    r110 r368  
    6464  G4bool   useMulineEvt;
    6565  G4bool   useNormalEvt;
     66  G4bool   usePDKNuancev2;    //JEC 1/06/07
     67  G4bool   useNuBeamNuancev2; //JEC 1/06/07
    6668  std::fstream inputFile;
    6769  G4String vectorFileName;
    … …  
    8688  G4int    _counterCublic;
    8789public:
     90 
     91  void SetMulineEvtGenerator(G4bool choice) { useMulineEvt = choice; }
     92  G4bool IsUsingMulineEvtGenerator() { return useMulineEvt; }
     93 
     94  void SetNormalEvtGenerator(G4bool choice) { useNormalEvt = choice; }
     95  G4bool IsUsingNormalEvtGenerator()  { return useNormalEvt; }
     96 
     97  //JEC 01/06/07
     98  void SetPDKNuancev2(G4bool choice) { usePDKNuancev2 = choice; }
     99  G4bool IsUsingPDKNuancev2() { return usePDKNuancev2; }
     100 
     101  //JEC 01/06/07
     102  void SetNuBeamNuancev2(G4bool choice) { useNuBeamNuancev2 = choice; }
     103  G4bool IsUsingNuBeamNuancev2() { return useNuBeamNuancev2; }
    88104
    89    void SetMulineEvtGenerator(G4bool choice) { useMulineEvt = choice; }
    90    G4bool IsUsingMulineEvtGenerator() { return useMulineEvt; }
    91 
    92    void SetNormalEvtGenerator(G4bool choice) { useNormalEvt = choice; }
    93    G4bool IsUsingNormalEvtGenerator()  { return useNormalEvt; }
    94105
    95106  void OpenVectorFile(G4String fileName) {

  • MEMPHYS/HEAD/MEMPHYS/PrimaryGeneratorMessenger.hh

    r70 r368  
    77
    88class G4UIdirectory;
     9class G4UIcmdWithABool;
    910class G4UIcmdWithAString;
    1011
    … …  
    3233  G4UIcmdWithAString* genCmd;
    3334  G4UIcmdWithAString* fileNameCmd;
    34  
     35  G4UIcmdWithABool*   pdkNuanceCmd;
     36  G4UIcmdWithABool*  beamNuanceCmd;
    3537};
    3638}

  • MEMPHYS/HEAD/applications/MEMPHYS_analysis_aida_ROOT.cxx

    r196 r368  
    1919#include <TApplication.h>
    2020
     21#include <TStyle.h>
     22
    2123#include <iostream>
    2224
     25#include "../scripts/ROOT/rootlogon.C"
    2326#include "../scripts/ROOT/aida_ROOT.C"
    2427
    … …  
    2831  new TApplication("MEMPHYS_analysis_aida_ROOT",&aArgc,aArgv);
    2932
     33  rootlogon();
    3034  aida_ROOT();
    3135

  • MEMPHYS/HEAD/applications/MEMPHYS_batch.cxx

    r247 r368  
    101101  }
    102102
    103   runManager->BeamOn(1);
     103  runManager->BeamOn(1000);
    104104
    105105  //JEC interactive session  delete visManager;

  • MEMPHYS/HEAD/cmt/requirements

    r362 r368  
    4646# With Geant4 global libs :
    4747macro MEMPHYS_Geant4_incs "${OSC_Geant4_incs}"
    48 macro MEMPHYS_Geant4_linkopts "-L${OSC_Geant4_lib} -lG4physicslists -lG4readout -lG4run -lG4event -lG4tracking -lG4processes -lG4digits_hits -lG4track -lG4particles -lG4geometry -lG4graphics_reps -lG4materials -lG4intercoms -lG4global -lCLHEP"
     48macro MEMPHYS_Geant4_linkopts "-L${OSC_Geant4_lib} -lG4physicslists -lG4readout -lG4run -lG4event -lG4tracking -lG4processes -lG4digits_hits -lG4track -lG4particles -lG4geometry -lG4graphics_reps -lG4materials -lG4intercoms -lG4global -lCLHEP-2.0.3.1"
    4949
    5050# Waiting Geant4 DLL on Windows...
Note: See TracChangeset for help on using the changeset viewer.