Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/medical/DICOM/src/DicomPhantomZSliceMerged.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /examples/extended/medical/DICOM/src/DicomPhantomZSliceMerged.cc (Version 11.3.0) and /examples/extended/medical/DICOM/src/DicomPhantomZSliceMerged.cc (Version 10.6.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
 27 /// \file medical/DICOM/src/DicomPhantomZSlice     27 /// \file medical/DICOM/src/DicomPhantomZSliceMerged.cc
 28 /// \brief Implementation of the DicomPhantomZ     28 /// \brief Implementation of the DicomPhantomZSliceMerged class
 29 //                                                 29 //
 30 //                                                 30 //
 31 // The code was written by :                       31 // The code was written by :
 32 //      * Jonathan Madsen : jonathan.madsen@ce     32 //      * Jonathan Madsen : jonathan.madsen@cern.ch (12/18/2012)
 33 //                                                 33 //
 34 //  Texas A&M University                           34 //  Texas A&M University
 35 //  3133 TAMU, Zachry Building                     35 //  3133 TAMU, Zachry Building
 36 //  College Station, TX 77843, USA                 36 //  College Station, TX 77843, USA
 37 //                                                 37 //
 38 //********************************************     38 //*******************************************************
 39                                                    39 
 40 #include "DicomPhantomZSliceMerged.hh"             40 #include "DicomPhantomZSliceMerged.hh"
 41                                                << 
 42 #include "G4SystemOfUnits.hh"                  << 
 43 #include "G4UnitsTable.hh"                         41 #include "G4UnitsTable.hh"
                                                   >>  42 #include "G4SystemOfUnits.hh"
 44                                                    43 
 45 //....oooOO0OOooo........oooOO0OOooo........oo     44 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 46                                                    45 
 47 DicomPhantomZSliceMerged::DicomPhantomZSliceMe <<  46 DicomPhantomZSliceMerged::DicomPhantomZSliceMerged()
                                                   >>  47 {
                                                   >>  48 
                                                   >>  49 }
 48                                                    50 
 49 //....oooOO0OOooo........oooOO0OOooo........oo     51 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 50                                                    52 
 51 DicomPhantomZSliceMerged::~DicomPhantomZSliceM     53 DicomPhantomZSliceMerged::~DicomPhantomZSliceMerged()
 52 {                                                  54 {
 53   fSlices.clear();                             <<  55     fSlices.clear();
 54 }                                                  56 }
 55                                                    57 
 56 //....oooOO0OOooo........oooOO0OOooo........oo     58 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 57                                                    59 
 58 void DicomPhantomZSliceMerged::CheckSlices()       60 void DicomPhantomZSliceMerged::CheckSlices()
 59 {                                                  61 {
 60   G4cout << "\nDicomPhantomZSliceMerged::Check <<  62   G4cout << "\nDicomPhantomZSliceMerged::Checking "
 61                                                <<  63          << fSlices.size() << " fSlices..." << G4endl;
                                                   >>  64   
 62   G4bool uniformSliceThickness = true;             65   G4bool uniformSliceThickness = true;
 63                                                <<  66   
 64   if (fSlices.size() > 1) {                    <<  67   if(fSlices.size() > 1) {
 65     if (fSlices.size() == 2) {                 <<  68     if(fSlices.size() == 2) {
 66       DicomPhantomZSliceHeader* one = fSlices.     69       DicomPhantomZSliceHeader* one = fSlices.begin()->second;
 67       DicomPhantomZSliceHeader* two = fSlices.     70       DicomPhantomZSliceHeader* two = fSlices.end()->second;
 68                                                <<  71       
 69       G4double real_distance = (two->GetSliceL <<  72       G4double real_distance = (two->GetSliceLocation()-one->GetSliceLocation())/2.;
 70                                                <<  73       
 71       if (one->GetMaxZ() != two->GetMinZ()) {  <<  74       if(one->GetMaxZ() != two->GetMinZ()) {
 72         one->SetMaxZ(one->GetSliceLocation() + <<  75         one->SetMaxZ(one->GetSliceLocation()+real_distance);
 73         two->SetMinZ(two->GetSliceLocation() - <<  76         two->SetMinZ(two->GetSliceLocation()-real_distance);
 74         // one->SetMinZ(one->GetSliceLocation( <<  77         //one->SetMinZ(one->GetSliceLocation()-real_distance);
 75         // two->SetMaxZ(two->GetSliceLocation( <<  78         //two->SetMaxZ(two->GetSliceLocation()+real_distance);
 76         if (uniformSliceThickness) {           <<  79         if(uniformSliceThickness) {
 77           one->SetMinZ(one->GetSliceLocation() <<  80           one->SetMinZ(one->GetSliceLocation()-real_distance);
 78           two->SetMaxZ(two->GetSliceLocation() <<  81           two->SetMaxZ(two->GetSliceLocation()+real_distance);
 79         }                                          82         }
 80       }                                            83       }
 81     }                                          <<  84     } else {
 82     else {                                     << 
 83       auto ite0 = fSlices.begin();                 85       auto ite0 = fSlices.begin();
 84       auto ite1 = fSlices.begin();                 86       auto ite1 = fSlices.begin();
 85       auto ite2 = fSlices.begin();                 87       auto ite2 = fSlices.begin();
 86       ++ite1;                                      88       ++ite1;
 87       ++ite2;                                  <<  89       ++ite2; ++ite2;
 88       ++ite2;                                  <<  90       
 89                                                <<  91       for(; ite2 != fSlices.end(); ++ite0, ++ite1, ++ite2)
 90       for (; ite2 != fSlices.end(); ++ite0, ++ <<  92       {
 91         DicomPhantomZSliceHeader* prev = ite0-     93         DicomPhantomZSliceHeader* prev = ite0->second;
 92         DicomPhantomZSliceHeader* slice = ite1     94         DicomPhantomZSliceHeader* slice = ite1->second;
 93         DicomPhantomZSliceHeader* next = ite2-     95         DicomPhantomZSliceHeader* next = ite2->second;
 94         G4double real_max_distance = (next->Ge <<  96         G4double real_max_distance = (next->GetSliceLocation() -
 95         G4double real_min_distance = (slice->G <<  97                                       slice->GetSliceLocation())/2.;
                                                   >>  98         G4double real_min_distance = (slice->GetSliceLocation() -
                                                   >>  99                                       prev->GetSliceLocation())/2.;
 96         G4double real_distance = real_max_dist    100         G4double real_distance = real_max_distance + real_min_distance;
 97         G4double stated_distance = slice->GetM << 101         G4double stated_distance = slice->GetMaxZ()-slice->GetMinZ();
 98         if (real_distance != stated_distance)  << 102         if(real_distance != stated_distance) {
 99           uintmax_t sliceNum = std::distance(f << 103           uintmax_t sliceNum = std::distance(fSlices.begin(),ite1);
100           G4cout << "\tDicomPhantomZSliceMerge    104           G4cout << "\tDicomPhantomZSliceMerged::CheckSlices - \
101                     Slice Distance Error in sl << 105                     Slice Distance Error in slice [" << sliceNum 
102                  << sliceNum << "]: Real Dista << 106                  << "]: Real Distance = "
103                  << " mm, Stated Distance = "  << 107                  << real_distance/mm
104           slice->SetMinZ(slice->GetSliceLocati << 108                  << " mm, Stated Distance = " << stated_distance/mm << G4endl;
105           slice->SetMaxZ(slice->GetSliceLocati << 109           slice->SetMinZ(slice->GetSliceLocation()-real_min_distance);
106                                                << 110           slice->SetMaxZ(slice->GetSliceLocation()+real_max_distance);
107           if (ite0 == fSlices.begin()) {       << 111           
                                                   >> 112           if(ite0 == fSlices.begin()) {
108             prev->SetMaxZ(slice->GetMinZ());      113             prev->SetMaxZ(slice->GetMinZ());
109             // Using below would make all slic    114             // Using below would make all slice same thickness
110             // prev->SetMinZ(prev->GetSliceLoc << 115             //prev->SetMinZ(prev->GetSliceLocation()-real_min_distance);
111             if (uniformSliceThickness) {       << 116             if(uniformSliceThickness) {
112               prev->SetMinZ(prev->GetSliceLoca << 117               prev->SetMinZ(prev->GetSliceLocation()-real_min_distance); }
113             }                                  << 118             
114           }                                       119           }
115           if (static_cast<unsigned int>(std::d << 120           if(static_cast<unsigned int>(std::distance(fSlices.begin(),ite2)+1)==
116           {                                    << 121              fSlices.size()) {
117             next->SetMinZ(slice->GetMaxZ());      122             next->SetMinZ(slice->GetMaxZ());
118             // Using below would make all slic    123             // Using below would make all slice same thickness
119             // next->SetMaxZ(next->GetSliceLoc << 124             //next->SetMaxZ(next->GetSliceLocation()+real_max_distance);
120             if (uniformSliceThickness) {       << 125             if(uniformSliceThickness) {
121               next->SetMaxZ(next->GetSliceLoca << 126               next->SetMaxZ(next->GetSliceLocation()+real_max_distance); }
122             }                                  << 
123           }                                       127           }
124         }                                         128         }
125       }                                           129       }
126     }                                             130     }
127   }                                               131   }
128   G4cout << G4endl;                               132   G4cout << G4endl;
129                                                << 133   
130   for (auto ite = fSlices.cbegin(); ite != fSl << 134   for(auto ite = fSlices.cbegin(); ite != fSlices.cend(); ++ite) {
131     ite->second->DumpToFile();                    135     ite->second->DumpToFile();
132   }                                               136   }
                                                   >> 137   
133 }                                                 138 }
134 //....oooOO0OOooo........oooOO0OOooo........oo    139 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
135                                                   140