Changeset 252 in Idarraga


Ignore:
Timestamp:
Nov 16, 2011, 5:10:18 PM (13 years ago)
Author:
idarraga
Message:
 
Location:
allpix
Files:
4 added
4 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • allpix/include/AllPixDigitInterface.hh

    r15 r252  
    6060
    6161/*
    62 inline void* AllPixMedipix2Digit::operator new(size_t)
     62inline void* AllPixMimosa26Digit::operator new(size_t)
    6363{
    6464        void* aDigi;
    65         aDigi = (void*) AllPixMedipix2DigitAllocator.MallocSingle();
     65        aDigi = (void*) AllPixMimosa26DigitAllocator.MallocSingle();
    6666        return aDigi;
    6767}
    … …  
    6969//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    7070
    71 inline void AllPixMedipix2Digit::operator delete(void* aDigi)
     71inline void AllPixMimosa26Digit::operator delete(void* aDigi)
    7272{
    73         AllPixMedipix2DigitAllocator.FreeSingle((AllPixMedipix2Digit*) aDigi);
     73        AllPixMimosa26DigitAllocator.FreeSingle((AllPixMimosa26Digit*) aDigi);
    7474}
    7575*/

  • allpix/include/AllPixDigitizerInterface.hh

    r181 r252  
    77
    88#include "G4VDigitizerModule.hh"
    9 #include "AllPixMedipix2Digit.hh"
     9#include "AllPixMimosa26Digit.hh"
    1010#include "G4PrimaryVertex.hh"
    1111#include "ReadGeoDescription.hh"

  • allpix/include/AllPixEventAction.hh

    r57 r252  
    55#include "G4Event.hh"
    66
    7 //#include "AllPixMedipix2Digitizer.hh"
     7//#include "AllPixMimosa26Digitizer.hh"
    88#include "AllPixDigitizerInterface.hh"
    99#include "G4VDigitizerModule.hh"

  • allpix/include/AllPixRun.hh

    r226 r252  
    99#include "AllPixTrackerHit.hh"
    1010#include "AllPixRunAction.hh"
    11 #include "AllPixMedipix2Digit.hh"
     11#include "AllPixMimosa26Digit.hh"
    1212#include "AllPixDigitInterface.hh"
    1313

  • allpix/macros/oneDetector.in_fragment

    r66 r252  
    2525#########################
    2626# GPS
    27 /gps/particle e+
     27/gps/particle e-
    2828/gps/pos/type Plane
    2929#/gps/pos/rot1 0 0 1
    … …  
    3737/gps/hist/type energy
    3838# spectra
    39 /gps/hist/point 4000 1
     39/gps/hist/point 2.2 1
    4040
    4141/gps/source/list

  • allpix/macros/oneDetector_Inventor_vis.in

    r84 r252  
    2020/control/alias enhanceZ 5.0
    2121
    22 /allpix/extras/setAppliancePosition  -4.3 28.2 {appPosZ} mm
    23 /allpix/extras/setWrapperEnhancement 0. 0. {enhanceZ} mm
     22#/allpix/extras/setAppliancePosition  -4.3 28.2 {appPosZ} mm
     23#/allpix/extras/setWrapperEnhancement 0. 0. {enhanceZ} mm
    2424
    2525# Build detectors
    … …  
    4343/allpix/phys/verbose 0
    4444
    45 /vis/open OIX 1024x768-100+100
     45#/vis/open OIX 1024x768-100+100
    4646#/vis/open OGLIXm 1024x768-100+100
    4747
    … …  
    4949#/vis/open OGLIQt
    5050#/vis/open OGLSQt
    51 #/vis/open OIX
     51/vis/open OIX
    5252#/vis/open OGLIX 1024x768-100+100
    5353#/vis/open OGLSXm
    … …  
    7878#########################
    7979# GPS
    80 /gps/particle e+
     80/gps/particle e-
    8181/gps/pos/type Plane
    8282#/gps/pos/rot1 0 0 1
    … …  
    9090/gps/hist/type energy
    9191# spectra
    92 /gps/hist/point 100 1
     92/gps/hist/point 2.2 1
    9393
    9494/gps/source/list

  • allpix/models/pixeldetector.xml

    r220 r252  
    77<pixeldet id="300,301,302,303,304,305">
    88
    9 <digitizer>Medipix2</digitizer>
     9<digitizer>Mimosa26</digitizer>
    1010
    1111<npix_x>1152</npix_x>
    … …  
    129129</pixeldet>
    130130
     131<!-- DOS -->
     132<pixeldet id="500">
     133
     134<digitizer>FEI3Standard</digitizer>
     135
     136<npix_x>1</npix_x>
     137<npix_y>1</npix_y>
     138<npix_z>0</npix_z>
     139
     140<pixsize_x units="um">1000.</pixsize_x>
     141<pixsize_y units="um">1000.</pixsize_y>
     142<pixsize_z units="um">300.</pixsize_z>
     143
     144<chip_hx units="um">1</chip_hx>
     145<chip_hy units="um">1</chip_hy>
     146<chip_hz units="um">1</chip_hz>
     147
     148<sensor_resistivity>5000.0</sensor_resistivity>
     149
     150<chip_posx units="um">0.</chip_posx>
     151<chip_posy units="um">0.</chip_posy>
     152<chip_posz units="um">0.</chip_posz>
     153
     154<sensor_hx units="um">1300.</sensor_hx>
     155<sensor_hy units="um">1300.</sensor_hy>
     156<sensor_hz units="um">300.</sensor_hz>
     157
     158<sensor_gr_excess_htop units="um">300.0</sensor_gr_excess_htop>
     159<sensor_gr_excess_hbottom units="um">300.0</sensor_gr_excess_hbottom>
     160<sensor_gr_excess_hright units="um">300.0</sensor_gr_excess_hright>
     161<sensor_gr_excess_hleft units="um">300.0</sensor_gr_excess_hleft>
     162
     163<sensor_posx units="mm">0.</sensor_posx>
     164<sensor_posy units="mm">0.</sensor_posy>
     165<sensor_posz units="mm">0.</sensor_posz>
     166
     167<pcb_hx units="mm">3.0</pcb_hx>
     168<pcb_hy units="mm">3.0</pcb_hy>
     169<pcb_hz units="mm">0.80</pcb_hz>
     170
     171</pixeldet>
     172
     173
    131174</detectors>

  • allpix/src/AllPixDetectorConstruction.cc

    r250 r252  
    6666
    6767#include "G4DigiManager.hh"
    68 #include "AllPixMedipix2Digitizer.hh"
     68#include "AllPixMimosa26Digitizer.hh"
    6969#include "AllPixFEI3StandardDigitizer.hh"
    7070
    … …  
    188188        if(m_clearanceToBuildGeometry){
    189189
    190                 G4cout << "Clearance obtained to build the Medipix devices." << G4endl;
     190                G4cout << "Clearance obtained to build the pixel devices." << G4endl;
    191191
    192192                // Read the database
    … …  
    424424
    425425        ///////////////////////////////////////////////////////////
    426         // The Medipix !
     426        // The pixel detector !
    427427        //
    428428        pair<G4String, G4String> wrapperName = make_pair("wrapper", "");
    … …  
    594594                                geoMap[*detItr]->GetSensorYOffset(),
    595595                                geoMap[*detItr]->GetSensorZOffset());
    596                 // Apply position Offset for the Medipix due to the enhancement
     596                // Apply position Offset for the detector due to the enhancement
    597597                if(m_vectorWrapperEnhancement.find(*detItr) != m_vectorWrapperEnhancement.end()){
    598598                        posDevice.setX(posDevice.x() - m_vectorWrapperEnhancement[*detItr].x()/2.);

  • allpix/src/AllPixEventAction.cc

    r87 r252  
    77#include "G4SDManager.hh"
    88#include "G4PrimaryVertex.hh"
    9 #include "AllPixMedipix2Digitizer.hh"
     9#include "AllPixMimosa26Digitizer.hh"
    1010#include "AllPixFEI3StandardDigitizer.hh"
    1111
    … …  
    6666        G4DigiManager * fDM = G4DigiManager::GetDMpointer();
    6767        // find digitizer module and digitize
    68         AllPixMedipix2Digitizer * myDM;
     68        AllPixMimosa26Digitizer * myDM;
    6969
    7070        G4PrimaryVertex * pv = evt->GetPrimaryVertex();
    7171
    7272        for(G4int itr = 0 ; itr < m_nDigitizers ; itr++){
    73                 myDM = (AllPixMedipix2Digitizer*)fDM->FindDigitizerModule( digitizerModulesNames[itr] );
     73                myDM = (AllPixMimosa26Digitizer*)fDM->FindDigitizerModule( digitizerModulesNames[itr] );
    7474                myDM->SetPrimaryVertex(pv);
    7575                myDM->Digitize();

  • allpix/src/AllPixSetupDigitizers.cc

    r185 r252  
    99#include "G4SDManager.hh"
    1010#include "G4PrimaryVertex.hh"
    11 #include "AllPixMedipix2Digitizer.hh"
     11#include "AllPixMimosa26Digitizer.hh"
    1212#include "AllPixFEI3StandardDigitizer.hh"
    1313
    … …  
    104104                        dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
    105105                        cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
    106                 } else if (digitizerName == "Medipix2") {
    107                         AllPixMedipix2Digitizer * dp = new AllPixMedipix2Digitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
     106                } else if (digitizerName == "Mimosa26") {
     107                        AllPixMimosa26Digitizer * dp = new AllPixMimosa26Digitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
    108108                        dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
    109109                        cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
Note: See TracChangeset for help on using the changeset viewer.