--------------- commit 19 --------------- - BUGFIX1: uncertainties in geometry due to trafos -> LATTICE geometry rebuild with normal tilted volumes - geometrical efficiency for TOFWALL implemented - to avoid overflow of particle block by adding only tracks exiting the non-scoring volumes (i.e. iron of ALADIN and container of MUSIC4) - BUGFIX2: when multiple particles were produced score_start and score_tofw supposed all tracks to come from the last one in the stack - region generation of BMON put partly into Geometry.xx, old code left in parenthesis (Vincenzo: if no objections I will delete the old code) - TOF-Wall geometry implemented with 2*96 slats, following details by C. Sfienti, Geant4 SPALADIN, and literature on TOF-Wall --------------- commit 20 --------------- - cosmetic for comments and indents --------------- commit 21 --------------- - Merging of the EVENT_STRUCT - All the event information and structure is the class Event (Evento.XX). The file EventStruct.h was deleted. - I didn't want to change the reconstruction code (i.e. Analysis.cpp, EventData.XX), but to avoid double work and problems with updating some suggestions: - EventData should inherit from Evento or create an instance of it intead of getting just the EVENT_STRUCT (i.e. to use such methods as Dump(), Clea (), ... and to not duplicate them. The method void EventData::Book() could call a Book method from Evento.cpp which sets the correspondence between the risultati structure and the ROOT tree.) - BUGFIX3: in mgdraw.f: AM(JTRACK) was called several times without checking that JTRACK>=-6, solutio: use AMPART instead - BUGFIX4: abort with floating exception in region of bmon - following line caused abort when momentum ==0. : Pvers.SetXYZ(fpxp/pmodulo,fpyp/pmodulo,fpzp/pmodulo); - was replaced with: if (pmodulo!=0.){ Pvers.SetXYZ(fpxp/pmodulo,fpyp/pmodulo,fpzp/pmodulo); }else{ printf("WARNING: FindPca(): momentum is 0 and thus pmodulo=0 is set to 1"); Pvers.SetXYZ(0.,0.,1.)//TODO: Vincenzo: ok like that??? } - BUGFIX5: the routine trovapca() was called with xtrack(0) instead of ztrack(0), i.e.: call trovapca(status, xtrack(0), ytrack(0), xtrack(0), & pp(1), pp(2), pp(3), pca(1), pca(2), pca(3), dmin, $ timdrift) - scoring layer in front of TOF-Walls (Front and Back) inserted which has the area of the TOF-Wall sensitive surface as seen by the beam - tw_common enlarged by particle coordinates in his own reference frame --------------- commit 22 TTB --------------- - added PARTICLE USER VARIABLES, introduced legend in mgdraw.f: c LEGEND c PARTICLE USER VARIABLES c ISPUSR(MKBMX2)= current particle ID c ISPUSR(1) = parent particle ID c ISPUSR(2) = used flag(=1) if particle created by EM interactions c ISPUSR(3) = stores generating interaction c ISPUSR(4) = stores production region c SPAUSR(1) = stores production momentum c SPAUSR(2) = stores mass (for easier access when calculating kin. energy) - removed old (and already commented) region generation for bmon in gsi_geo.cc - BUGFIX6: stuprf.f: track number was not increased if particle was produced in non-scoring region due to premature RETURN - BUGFIX7: mgdraw.f: production region of a particle was sometimes mistaken with production region of parent (using Nrgflk(NPFLKA)) - ISPARK (2,NPFLKA)<->ispusr(2) now contains the production region of the current particle, also particle re-exiting non-scoing volumes were counted double - BUGFIX8: stuprf.f: "xs" instead of "xx" was set for the vxi coordinate of the particle_common block - this was leading to a coordinate of x=0 for all particles generated with stuprf.f - BUGFIX9: idtw(ntw) was plugged into particle_common variables leading sometimes to misidentifications - BUG: mgdraw_lib.f: Vincenzo have a look: BUG: numtrack(nump) is not necessarily the current particle! use ISPUSR(mkbmx2) instead - SUGGESTION: for Vincenzo: numtrack stores the particle ID. idst, idmon, ids1 ... should store not this id but the number of the nump scheme - this would avoid some loops when search for the corresponding particle in the particle_common block (I did so for the TOF-Wall detector block) - idst = index of the particle in the /particle_common/ block BUG: is not true!!!!!!!!!!!!!!!!!!!!!!! - implemented for TOF-Wall: - BC408 scintillation material after description from BICRON for BC408 Polyvinyl toluene Plastic Scintillator (before it was BC418) - Rear window (Ti 0.01cm thickness) - Holes in TOF-Wall adapted after TG's comments - implemented scoring in each slat (added to tofw_common and root): - nb of slats in front/back crossed by particle, warning if more than 2 (WATCHOUT:can be created inside) - for each slat crossed (max two front, two back wall) - slat nb - entrance/exit points - entrance/exit momentum - time of energy release - ED and QED - implemented for MUSIC - Rear window (Ti 0.01cm thickness), taken the same as front window, it has to be checked if this is correct! - usrini.f: find regions calls "stop" if not complete, all regions included - non-scoring region changed from mu_BO to mu_P - stupre.f/stuprf.f: temporary consistency checks for existing parent particle and unique ID were introduced --------------- commit 23 TTB --------------- - BUGFIX10: (concerning the standing BUG and SUGGESTION from commit 22) - idst, idmon now store the index of the particle in the /particle_common/ block (as was stated in mgdraw.inc already before) and not as previously the particle ID. - ISPUSR(mkbmx2) is used and not numtrack(nump) as before - for the score_bmon routine a safty check was added (as in the score_start) routine making that the current particle is registered in the particle_commmon -> if not, this particle will be skipped for scoring and there is a warning output --------------- commit 24 TTB --------------- - BUGFIX11: x,y,zinTFtw not initialized in usrein.f - BEAM PARAMETERS changed: from annular r=0.1cm to Gaussian 0.3 cm FWHM in x and y - magfld.f filename and directory character length enlarged to 300 - BUGFIX12: float exception caused crash, in various places divisions and sqrt operation were "made safe", the crash didn't re-occur - BUG: recoil particles have no parent (parent ID -10) also when produced outside of non-scoring region - BUGFIX13: set TOF-Wall scoring layer from 0.1 to 2.0 cm since some particles seemed to be skipped as they don't deposit energy in such a small volume. - BUGFIX14: in Evento.cpp the line "eve.pzoutst[eve.nst-1] = fpzoutst;" was missing this led to a constant zero value of the corresponding variable in the root-file - BUGFIX15: like BUGFIX14, same for: "eve.pzouttw[eve.ntw-1] = fpzouttw;" - added Segnale.h and Segnale.cpp to project, contained class is intended to take care of future signal modelling - a simple preliminary signal modelling of the TOF-Wall was added considering attenuation, signal-speed in TOF Slats and Slat cross-talk, NO digitization (some material parameters need to be still adapted) --------------- commit 25 TTB --------------- - increase NUMPMAX and other from 200 -> 400 - added skeleton signal modelling for Start Counter - added bodies/regions of onion ring detector - added Verbosity control for FLUKA geometry output (kVerbosity) - add gsi.reg file which contains encoding for FLUKA regions (name<->number) - added functionality: materials are assigned in gsi_geo.cc - MIMOSA26 inserted, scoring output for ROOT added, check with MIMOSA stand-alone version shows strange spike at end of nrow histogram - BUG: STOP abort can occur due to "orphan track" when there is a "nump-overflow" (likely for project or target with high Z) - BUGFIX16: stupre else IESPAK(1,KP) = ISPUSR(1) !if not first EM interaction then take id of nonno to be new id of parent - BUGFIX17: TheGeometry.TW_SlatParamBOX used global instead of interene variables, corrected (no practical consequences) --------------- commit 26 TTB --------------- - modifications in the way of scoring tracks in the particle_common - integrated and activated EM tracks are also stored in common block above a certain threshold (set to 1MeV) - EM particles have as "parent particle" the HADR particle (up in the generation chain) by which they where produced - REMINDER: and particles produced in non-scoring volume have the last (HADR) particle produced outside of non-scoring volume as parent - changed logic for scoring in mgdraw_lib.f routine (detectors) - new protocol is (also for MIMOSA): - look if current particle id is already registered in particle_common - if not: look if parent particle id (see above) is registered in particle_common - if not: issue a warning and do not score the current particle (skip!) - if current particle or parent id is registered in particle_common - score new value in the respective detector common and assign it to the index in the particle_common with the found id (note that this changes the orignal (and also for MIMOSA) implemented strategy where the particle id is scored in the detector common (and not the index of the particle_common)) - max array numbers set to 1000 - 100keV for delta, produciton, and transport cuts, and EM particle scoring - added calculation of time output by amplitude threshold for start counter - added calculation of time output by amplitude threshold for TOF-Wall, time output is given relative to time from start counter - root-file stores TOF-Wall signals by slat ID (space saving) --------------- commit 027 TTB --------------- - MIMOSA dummy cluster class - MIMOSA track finding algorithm including chi2 fitting --------------- commit 028 TTB --------------- - added: EM particle generated below threshold (SCO_THRES_EM) in stuprf.f are not scored in particle_common --------------- commit 029 TTB --------------- - Evento.XXX: consequent use of CleanEvent() method - introduced new variables for signal of MIMOSA in Evento - introduced cluster forming (by simple diffusion model) and scoring in the FLUKA simulation - introduced the calorimeter (2cm thick cylinder starting at beginning of target, Material: SCSN38 (same as start counter)) - Cluster.XXX: "Neighbour finding" clustering algorithm (without evaluation, and errors) --------------- commit 030 TTB --------------- xxxx --------------- commit 031 TTB --------------- Vincenzo --------------- commit 032 TTB --------------- - added in Evento.cpp: initialization of: fEvent->ntg = MAXTG; - correcting position calculation of MIMOSA in Geometry.cpp --------------- commit 033 TTB --------------- - BUGFIX18: material: AIR was of very low density (very small fractions of mass given) - also bmogas was affected - implementation of cluster evaluation and position error as function of cluster size - BUGFIX19: corrected a small shift of MIMOSA in z in Geometry.cpp - BUGFIX20: nregvac was missing in mgdraw.inc --------------- commit 034 TTB --------------- - added Helper class --------------- commit 035 TTB --------------- - updates with IR study for OOTR air vs. vacuum: - MIMOSA thickness: 14+40um - ALADiN moved to 60cm from target - introduced IR region to switch vacuum vs. air --------------- commit 038 TTB --------------- - renaming ROOT tree variables in a (more) coherent scheme - replacing parenthesis in BMON region construction - MUSIC scoring implemented - MUSIC signal (simple) implemented - restructuring of Segnale: adding Init methods for each subdetector - MIMOSA signal variables as needed - KENTROS implemented (with spaceholder signal variables) --------------- commit 039 TTB --------------- revision 92 ID39 - BM: implemented new Beam Monitor - BUG: geometry of the new beam monitor is wrong (to be fixed with Alessio) - TW: changed TOF-Wall signal scale for fitting l0reco - BUGFIX21: MUSIC signal amplitude and time were exchanged - FIX: strange crash for casting double->int, cirumvented in the program - MI: introduced the vertex mapping need for reconstruction - MI: implemented thinned 14um geometry of MIMOSA and staggering like in reconstruction (100um overlap) - MI: 1st test beam parametrization added but assuring 100% efficiency for all pixels which are traversed by a particle - ON: put onion veto behind the two walls of the TOF-Wall - ON: scoring for veto added - AL: switched angle and magnetic field from bending left to bending right - AL: collimator and entrance window in front of ALADiN added - AL: scale magnetic field in x and y to fit aperture - MU: central cathode (for now 1mm, kapton) and frame around active area added - BUGFIX22: trtim was always zero, now it should give the production time of the particle --------------- commit 040 TTB --------------- revision 93 - BUGFIX23: conversion missing: TW_ShiftOfSlats_Y -> TW_ShiftOfSlats_F_Y --------------- commit 041 TTB --------------- revision 120 ID40 - implemented ED signal for ST,KE,MU,TW, ON - implemtented simple signal for KE and ON - added Trigger class - changed maxnump: 1000->2000 - renaming num_event to EventNumber and adding it to root tree - AL: set pressure to 1e-4atm --------------- commit 042 TTB --------------- revision 283 ID042 - BUGFIX23: EM production and transport threshold was set for all materials equal to the one for MIMOSA - added configuration for EM production and transport thresholds and set them all to 1MeV, except for the ALADiN iron --------------- commit 043 TTB --------------- revision 287 ID043 - BM: fixed new BMON geometry from Alessio --------------- commit 044 TTB --------------- revision 529 ID044 - BUGFIX24: The KENTROS and ONION energy deposition variables were filled inconsistently with ER and QER - BM: updated geometry according to files from Vincenzo - KE: rotated geometry by 1/2 a slat - KE: integration of simple signal velocity and attenuation in the scintillator --------------- commit 045 TTB --------------- revision 553 ID044.1 - BUGFIX25: Segnale.cpp: KENTROS transport distance: small and big end-cap parameters were switched --------------- commit 045 TTB --------------- revision 562 ID044.2 - BUGFIX26: mgdraw_lib.f: region index of the keregtype was wrong (kentros region index used) --------------- commit 046 TTB --------------- revision 573 ID044.3 - BUGFIX27: fix the bad BUGFIX25 :) --------------- commit 047 MV --------------- revision XXX 15/7/2012 - sim/trunk/bmelink_gsi.csh (removed $*) - sim/trunk/config/FIRST_geo.map (new ref.point for TOF independent of Music, geometry paramenters changed for TOF, Music and Aladin according to survey) - sim/trunk/Geometry.cpp (new ref. point for TOF) - sim/trunk/Geometry.h (" " " " " ) - sim/trunk/gsi_geo.cc + sim/trunk/gsi_geo.h (IR box enlarged, Kentrons z-pos changed according to survey, AL_CURR changed, Brass layer added after TF front, onion position changed, Entrance flange z-pos and diameter changed, hole in Front TOF added) - sim/trunk/gsi.inp (added brass) - sim/trunk/lfluka_root (removed link to CEN libraries) - sim/trunk/Segnale.h (changed light speed in TOF scintillator, TOF amp and time noise changed) - sim/trunk/Segnale.cpp (TW_Noise called to simulate TOF resolutions) --------------- commit 048 MV --------------- revision 727 30/7/2012 - sim/trunk/Segnale.h (TOF absorbtion length changed) - sim/trunk/Segnale.cpp (slat-by-slat min energy threshold applied for TOF TDCs according to measurements from data, no threshold for ADCs) - sim/trunk/INPUT/TW_TDCthresholds_MeV.dat (file with energy thresholds for TOF TDCs) - rec/trunk/libs/src/TAGmclib/TATactNtuMC.cxx (changed TOF charge assignement) - rec/trunk/libs/src/TAGbase/Makefile (-lEve added) ---------------- LAST COMMIT -----------------