Changeset 1655
- Timestamp:
- 03/03/10 16:46:29 (5 months ago)
- Files:
-
- 2 modified
-
branches/yt-1.6/yt/lagos/UniversalFields.py (modified) (7 diffs)
-
trunk/yt/lagos/UniversalFields.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/yt-1.6/yt/lagos/UniversalFields.py
r1585 r1655 196 196 # Note that we mandate grid-type here, so this is okay 197 197 return particles 198 198 199 def _convertParticleMass(data): 199 200 return data.convert("Density")*(data.convert("cm")**3.0) … … 637 638 validators=[ValidateParameter("center")], 638 639 convert_function = _ConvertRadiusCGS, units=r"\rm{cm}", 639 particle_type = True) 640 particle_type = True, 641 display_name = "Particle Radius") 640 642 add_field("Radius", function=_Radius, 641 643 validators=[ValidateParameter("center")], … … 646 648 add_field("RadiusMpc", function=_Radius, 647 649 validators=[ValidateParameter("center")], 648 convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}") 650 convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}", 651 display_name = "Radius") 649 652 add_field("ParticleRadiusMpc", function=_ParticleRadius, 650 653 validators=[ValidateParameter("center")], 651 654 convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}", 652 particle_type=True) 655 particle_type=True, 656 display_name = "Particle Radius") 653 657 654 658 def _ConvertRadiuskpc(data): … … 657 661 validators=[ValidateParameter("center")], 658 662 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}", 659 particle_type=True) 663 particle_type=True, 664 display_name = "Particle Radius") 660 665 add_field("Radiuskpc", function=_Radius, 661 666 validators=[ValidateParameter("center")], 662 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}") 667 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}", 668 display_name = "Radius") 663 669 664 670 def _ConvertRadiuskpch(data): … … 667 673 validators=[ValidateParameter("center")], 668 674 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}", 669 particle_type=True) 675 particle_type=True, 676 display_name = "Particle Radius") 670 677 add_field("Radiuskpch", function=_Radius, 671 678 validators=[ValidateParameter("center")], 672 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}") 679 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}", 680 display_name = "Radius") 673 681 674 682 def _ConvertRadiuspc(data): … … 677 685 validators=[ValidateParameter("center")], 678 686 convert_function = _ConvertRadiuspc, units=r"\rm{pc}", 679 particle_type=True) 687 particle_type=True, 688 display_name = "Particle Radius") 680 689 add_field("Radiuspc", function=_Radius, 681 690 validators=[ValidateParameter("center")], 682 convert_function = _ConvertRadiuspc, units=r"\rm{pc}") 691 convert_function = _ConvertRadiuspc, units=r"\rm{pc}", 692 display_name="Radius") 683 693 684 694 def _ConvertRadiusAU(data): … … 687 697 validators=[ValidateParameter("center")], 688 698 convert_function = _ConvertRadiusAU, units=r"\rm{AU}", 689 particle_type=True) 699 particle_type=True, 700 display_name = "Particle Radius") 690 701 add_field("RadiusAU", function=_Radius, 691 702 validators=[ValidateParameter("center")], 692 convert_function = _ConvertRadiusAU, units=r"\rm{AU}") 703 convert_function = _ConvertRadiusAU, units=r"\rm{AU}", 704 display_name = "Radius") 693 705 694 706 add_field("ParticleRadiusCode", function=_ParticleRadius, 695 707 validators=[ValidateParameter("center")], 696 particle_type=True) 708 particle_type=True, 709 display_name = "Particle Radius (code)") 697 710 add_field("RadiusCode", function=_Radius, 698 validators=[ValidateParameter("center")]) 711 validators=[ValidateParameter("center")], 712 display_name = "Radius (code)") 699 713 700 714 def _RadialVelocity(field, data): -
trunk/yt/lagos/UniversalFields.py
r1585 r1655 196 196 # Note that we mandate grid-type here, so this is okay 197 197 return particles 198 198 199 def _convertParticleMass(data): 199 200 return data.convert("Density")*(data.convert("cm")**3.0) … … 637 638 validators=[ValidateParameter("center")], 638 639 convert_function = _ConvertRadiusCGS, units=r"\rm{cm}", 639 particle_type = True) 640 particle_type = True, 641 display_name = "Particle Radius") 640 642 add_field("Radius", function=_Radius, 641 643 validators=[ValidateParameter("center")], … … 646 648 add_field("RadiusMpc", function=_Radius, 647 649 validators=[ValidateParameter("center")], 648 convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}") 650 convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}", 651 display_name = "Radius") 649 652 add_field("ParticleRadiusMpc", function=_ParticleRadius, 650 653 validators=[ValidateParameter("center")], 651 654 convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}", 652 particle_type=True) 655 particle_type=True, 656 display_name = "Particle Radius") 653 657 654 658 def _ConvertRadiuskpc(data): … … 657 661 validators=[ValidateParameter("center")], 658 662 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}", 659 particle_type=True) 663 particle_type=True, 664 display_name = "Particle Radius") 660 665 add_field("Radiuskpc", function=_Radius, 661 666 validators=[ValidateParameter("center")], 662 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}") 667 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}", 668 display_name = "Radius") 663 669 664 670 def _ConvertRadiuskpch(data): … … 667 673 validators=[ValidateParameter("center")], 668 674 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}", 669 particle_type=True) 675 particle_type=True, 676 display_name = "Particle Radius") 670 677 add_field("Radiuskpch", function=_Radius, 671 678 validators=[ValidateParameter("center")], 672 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}") 679 convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}", 680 display_name = "Radius") 673 681 674 682 def _ConvertRadiuspc(data): … … 677 685 validators=[ValidateParameter("center")], 678 686 convert_function = _ConvertRadiuspc, units=r"\rm{pc}", 679 particle_type=True) 687 particle_type=True, 688 display_name = "Particle Radius") 680 689 add_field("Radiuspc", function=_Radius, 681 690 validators=[ValidateParameter("center")], 682 convert_function = _ConvertRadiuspc, units=r"\rm{pc}") 691 convert_function = _ConvertRadiuspc, units=r"\rm{pc}", 692 display_name="Radius") 683 693 684 694 def _ConvertRadiusAU(data): … … 687 697 validators=[ValidateParameter("center")], 688 698 convert_function = _ConvertRadiusAU, units=r"\rm{AU}", 689 particle_type=True) 699 particle_type=True, 700 display_name = "Particle Radius") 690 701 add_field("RadiusAU", function=_Radius, 691 702 validators=[ValidateParameter("center")], 692 convert_function = _ConvertRadiusAU, units=r"\rm{AU}") 703 convert_function = _ConvertRadiusAU, units=r"\rm{AU}", 704 display_name = "Radius") 693 705 694 706 add_field("ParticleRadiusCode", function=_ParticleRadius, 695 707 validators=[ValidateParameter("center")], 696 particle_type=True) 708 particle_type=True, 709 display_name = "Particle Radius (code)") 697 710 add_field("RadiusCode", function=_Radius, 698 validators=[ValidateParameter("center")]) 711 validators=[ValidateParameter("center")], 712 display_name = "Radius (code)") 699 713 700 714 def _RadialVelocity(field, data):
